diff options
| author | Joshua Peek <josh@joshpeek.com> | 2010-01-30 14:39:41 -0600 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2010-01-30 14:39:59 -0600 |
| commit | 4f7a85d2c66f100f83e2fe264e1f03bf079f13dc (patch) | |
| tree | a9304cf3c3006b472da7e75cf339d6641160e728 /actionmailer/lib | |
| parent | ac20f2cea15844b5cc06bdfefbb410fc55ba5caf (diff) | |
| download | rails-4f7a85d2c66f100f83e2fe264e1f03bf079f13dc.tar.gz rails-4f7a85d2c66f100f83e2fe264e1f03bf079f13dc.tar.bz2 rails-4f7a85d2c66f100f83e2fe264e1f03bf079f13dc.zip | |
Revert "Merge branch 'rails/master' into ujs"
This reverts commit 3aa1ea1ae4baa4a03d03644e798eeb98a4745785, reversing
changes made to 2c12a71378d2146c822acb389b00b866f6420ff5.
Conflicts:
actionpack/lib/action_view/helpers/javascript_helper.rb
actionpack/lib/action_view/helpers/url_helper.rb
actionpack/test/template/url_helper_test.rb
Diffstat (limited to 'actionmailer/lib')
0 files changed, 0 insertions, 0 deletions