diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2014-01-04 09:30:01 +0000 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2014-01-04 09:30:01 +0000 |
| commit | 27bcec28bfb7272aa2cbe107c10bdafd5ebc32c9 (patch) | |
| tree | c7229cbb9709f20ab227303e3afd9ff26e55b90b /actionmailer/lib/action_mailer/preview.rb | |
| parent | 9ea54b2d8e8180c59f31b035765e058e743660bb (diff) | |
| download | rails-27bcec28bfb7272aa2cbe107c10bdafd5ebc32c9.tar.gz rails-27bcec28bfb7272aa2cbe107c10bdafd5ebc32c9.tar.bz2 rails-27bcec28bfb7272aa2cbe107c10bdafd5ebc32c9.zip | |
Fix mergefail in changelog
The line was duplicated
Diffstat (limited to 'actionmailer/lib/action_mailer/preview.rb')
0 files changed, 0 insertions, 0 deletions