diff options
| author | seb <seb@seb-U36JC> | 2011-11-24 09:21:36 +0000 |
|---|---|---|
| committer | seb <seb@seb-U36JC> | 2011-11-24 09:21:36 +0000 |
| commit | a4e533f1588a5d34dca4ab462b58ddd83eed37c5 (patch) | |
| tree | 58bb3b57ec5664e094ae151c18b6c1915256e364 /app/models/user_mailer.rb | |
| parent | d473fce1d0451c913d3ef697d3b45bd58c6fff54 (diff) | |
| parent | e649c2a7f19d0a75206149d886ff47b3ccda4e91 (diff) | |
Merge branch 'develop' into xapian-dcabo
Conflicts:
spec/models/xapian_spec.rb
Diffstat (limited to 'app/models/user_mailer.rb')
| -rw-r--r-- | app/models/user_mailer.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/app/models/user_mailer.rb b/app/models/user_mailer.rb index 0972e167d..7adf5b63c 100644 --- a/app/models/user_mailer.rb +++ b/app/models/user_mailer.rb @@ -46,7 +46,5 @@ class UserMailer < ApplicationMailer @body[:old_email] = old_email @body[:new_email] = new_email end - - end |