aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/lib
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-01-01 14:14:45 -0200
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-01-01 14:14:45 -0200
commitb94e2dd82c3c69d923c59842b8703856a715230c (patch)
treecdc7181252921c0c1ed57b47e7cc3f56a425e7b9 /actionmailer/lib
parente015f4e2e3e962a3713f40e91aa049d47ed7c7f2 (diff)
parentbb17c3b2105da30ef3260c3b489da85e4865eaa5 (diff)
downloadrails-b94e2dd82c3c69d923c59842b8703856a715230c.tar.gz
rails-b94e2dd82c3c69d923c59842b8703856a715230c.tar.bz2
rails-b94e2dd82c3c69d923c59842b8703856a715230c.zip
Merge pull request #13550 from vipulnsward/13437-fix
Fix for #13437 Conflicts: activerecord/CHANGELOG.md
Diffstat (limited to 'actionmailer/lib')
0 files changed, 0 insertions, 0 deletions