aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2012-06-19 01:55:33 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-06-21 11:03:06 -0300
commit40617c7e539b8b70469671619e3c1716edcfbf59 (patch)
tree6e6535743f79aa859813facce2f51a864215ad5a /actionpack
parent94489a2570c2b922a820e5e150dc33711379ea52 (diff)
downloadrails-40617c7e539b8b70469671619e3c1716edcfbf59.tar.gz
rails-40617c7e539b8b70469671619e3c1716edcfbf59.tar.bz2
rails-40617c7e539b8b70469671619e3c1716edcfbf59.zip
Merge branch 'acapilleri-update_nested_attributes'
Closes #6675 Conflicts: activerecord/lib/active_record/attribute_methods/dirty.rb
Diffstat (limited to 'actionpack')
0 files changed, 0 insertions, 0 deletions