mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
3b7947ea31
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. |
||
---|---|---|
.. | ||
behaviors.rb | ||
instance_delegator.rb | ||
method_wrappers.rb | ||
proxy_wrappers.rb | ||
reporting.rb |