aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/lib
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2012-02-01 06:03:21 -0800
committerSantiago Pastorino <santiago@wyeworks.com>2012-02-01 06:03:21 -0800
commit21735d225d43b389baf0cc3ed32b9ccc0000e08d (patch)
tree1965e60f201f5bea2d9b7e9f0995a15f24da18ff /actionmailer/lib
parent1444ec6c912b9a876447e9dc9085ccecaa630407 (diff)
parentc8c84397cdbd44f47ff9f8594a3dabfe8b3b1502 (diff)
downloadrails-21735d225d43b389baf0cc3ed32b9ccc0000e08d.tar.gz
rails-21735d225d43b389baf0cc3ed32b9ccc0000e08d.tar.bz2
rails-21735d225d43b389baf0cc3ed32b9ccc0000e08d.zip
Merge pull request #4815 from kennyj/fix_4749
Fix GH #4749. Remove branch options, because edge is not 3-2-stable.
Diffstat (limited to 'actionmailer/lib')
0 files changed, 0 insertions, 0 deletions