diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2012-09-21 22:49:20 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2012-09-21 22:49:20 +0530 |
| commit | 3b7947ea31489afd020419e3c22ee01ce4809103 (patch) | |
| tree | 447a5e56657c457a55004fc445699cfa581d625b /actionmailer/MIT-LICENSE | |
| parent | f74ddc8a4c748c3fb8ae7e03a5a211f87c025182 (diff) | |
| parent | 7c0e3b87efca780b086ff0c458fa78a6db444b4c (diff) | |
| download | rails-3b7947ea31489afd020419e3c22ee01ce4809103.tar.gz rails-3b7947ea31489afd020419e3c22ee01ce4809103.tar.bz2 rails-3b7947ea31489afd020419e3c22ee01ce4809103.zip | |
Merge branch 'master' of github.com:lifo/docrails
Conflicts:
actionmailer/lib/action_mailer/base.rb
activesupport/lib/active_support/configurable.rb
activesupport/lib/active_support/core_ext/module/deprecation.rb
guides/source/action_controller_overview.md
guides/source/active_support_core_extensions.md
guides/source/ajax_on_rails.textile
guides/source/association_basics.textile
guides/source/upgrading_ruby_on_rails.md
While resolving conflicts, I have chosen to ignore changes done in
docrails at some places - these will be most likely 1.9 hash syntax
changes.
Diffstat (limited to 'actionmailer/MIT-LICENSE')
0 files changed, 0 insertions, 0 deletions