diff options
| author | Mark Longair <mhl@pobox.com> | 2013-10-30 10:12:02 +0000 |
|---|---|---|
| committer | Mark Longair <mhl@pobox.com> | 2013-10-30 10:12:02 +0000 |
| commit | 95a92efe385ebe21b8f31424f2cef86ea9c9455d (patch) | |
| tree | c7d2530cf615cedc70cb463a9bc0f1c0c4de6729 /lib/actionmailer_patches.rb | |
| parent | 5964dc79a0e6608529ccf610460d1928811e8ef0 (diff) | |
| parent | 5aed12997b6d8950e20b1620fd643256ca56f818 (diff) | |
Merge branch 'switch-theme-script' into rails-3-develop
Conflicts:
config/initializers/alaveteli.rb
Diffstat (limited to 'lib/actionmailer_patches.rb')
0 files changed, 0 insertions, 0 deletions