aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorGodfrey Chan <godfreykfc@gmail.com>2014-08-17 11:59:46 -0700
committerGodfrey Chan <godfreykfc@gmail.com>2014-08-17 11:59:46 -0700
commita5e2d2ef8565a96ed915afe734f67b604fa48450 (patch)
treeede6951a5532f2acab505af4cc27b72858ffacd3 /actionpack/lib
parentb662273df3d546a1fdd2de79005fd802f0e12643 (diff)
parent2638d5c72444db1dc73c0593cb35f9916fc6284c (diff)
downloadrails-a5e2d2ef8565a96ed915afe734f67b604fa48450.tar.gz
rails-a5e2d2ef8565a96ed915afe734f67b604fa48450.tar.bz2
rails-a5e2d2ef8565a96ed915afe734f67b604fa48450.zip
Merge pull request #16458 from chancancode/ar_fix_reserved_inheritance
Fixed issue w/custom accessors + reserved name + inheritance Conflicts: activerecord/CHANGELOG.md
Diffstat (limited to 'actionpack/lib')
0 files changed, 0 insertions, 0 deletions