diff options
| author | Seb Bacon <seb.bacon@gmail.com> | 2011-11-24 10:35:49 +0000 |
|---|---|---|
| committer | Seb Bacon <seb.bacon@gmail.com> | 2011-11-24 10:35:49 +0000 |
| commit | 8494003ebf71ef437dfccb9374366a51ecb5924c (patch) | |
| tree | 88f105ebb3ebdd84b64b4b5cb5f00db5cacd9e2d /spec/models/incoming_message_spec.rb | |
| parent | fbfebdbe1c5b13f86f92404c3397d6dcb75766ce (diff) | |
| parent | b7075181100852ff2117d61b02881e84deaafa87 (diff) | |
Merge remote-tracking branch 'jpmckinney/pre1.9' into develop
Conflicts:
spec/controllers/request_controller_spec.rb
Diffstat (limited to 'spec/models/incoming_message_spec.rb')
| -rw-r--r-- | spec/models/incoming_message_spec.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/models/incoming_message_spec.rb b/spec/models/incoming_message_spec.rb index 3bec7aefd..1a4baca0b 100644 --- a/spec/models/incoming_message_spec.rb +++ b/spec/models/incoming_message_spec.rb @@ -1,3 +1,4 @@ +# coding: utf-8 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') describe IncomingMessage, " when dealing with incoming mail" do |