aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2012-08-17 14:17:36 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2012-08-17 14:17:36 -0700
commit366eb7216edd4515d4c5491df6868dbf9fecd261 (patch)
tree6861e0a6cda6b6f3a0d9859ba190514b86d785fa /activesupport/lib
parent271beddd8929758802e11826297adf92e40cd4af (diff)
parentb127d86c1823d60a29191ecc3c21c97ee3ac502c (diff)
downloadrails-366eb7216edd4515d4c5491df6868dbf9fecd261.tar.gz
rails-366eb7216edd4515d4c5491df6868dbf9fecd261.tar.bz2
rails-366eb7216edd4515d4c5491df6868dbf9fecd261.zip
Merge pull request #7380 from ernie/fix-nomethoderror-on-non-attribute-equalities
Fix merge error when Equality LHS is non-attribute
Diffstat (limited to 'activesupport/lib')
0 files changed, 0 insertions, 0 deletions