1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
rails--rails/activesupport/lib/active_support/deprecation
Vijay Dev 3b7947ea31 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.
2012-09-21 22:49:20 +05:30
..
behaviors.rb Merge branch 'master' of github.com:lifo/docrails 2012-09-21 22:49:20 +05:30
instance_delegator.rb Change ActiveSupport::Deprecation to class. 2012-09-13 08:42:00 +02:00
method_wrappers.rb Change ActiveSupport::Deprecation to class. 2012-09-13 08:42:00 +02:00
proxy_wrappers.rb Copy-edit deprecation relared documentation [ci skip] 2012-09-13 14:02:18 -03:00
reporting.rb Merge branch 'master' of github.com:lifo/docrails 2012-09-21 22:49:20 +05:30