rails/activemodel/lib
Xavier Noria 17c29a0df0 Merge remote-tracking branch 'docrails/master'
Conflicts:
	activesupport/lib/active_support/core_ext/hash/deep_merge.rb
	activesupport/lib/active_support/core_ext/hash/keys.rb
2013-11-24 20:00:24 +01:00
..
active_model Merge remote-tracking branch 'docrails/master' 2013-11-24 20:00:24 +01:00
active_model.rb Remove deprecated attr_protected/accessible 2013-06-27 20:38:30 +02:00