aboutsummaryrefslogtreecommitdiffstats
path: root/RAILS_VERSION
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-06-07 15:12:24 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-06-07 15:12:24 -0300
commitcf94a551dc56141b2b66521a77b9e20b97395979 (patch)
tree76ed30c0894ec09f85526339bc70fdff3c5481d7 /RAILS_VERSION
parent4cf63ce3731a43bd98f7b92b43dcf1be99c0b183 (diff)
parent3fab9d8821bc73b28a76f27353cab34d49096ad2 (diff)
downloadrails-cf94a551dc56141b2b66521a77b9e20b97395979.tar.gz
rails-cf94a551dc56141b2b66521a77b9e20b97395979.tar.bz2
rails-cf94a551dc56141b2b66521a77b9e20b97395979.zip
Merge pull request #15558 from sgrif/sg-rename-property
Rename `property` to `attribute` Conflicts: activerecord/lib/active_record/attribute_methods/serialization.rb activerecord/lib/active_record/base.rb
Diffstat (limited to 'RAILS_VERSION')
0 files changed, 0 insertions, 0 deletions