aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/integration.rb
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2012-09-19 06:07:48 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-09-19 10:10:00 -0300
commit61d5d2d8a97fd289b81991cd79dca3112e7ca135 (patch)
treed8f236d7ed6e7fd26829e0558ee5ddc242d49fee /activerecord/lib/active_record/integration.rb
parenta82f1e3f5d11c8dfba9f4c911745ec40a7965216 (diff)
downloadrails-61d5d2d8a97fd289b81991cd79dca3112e7ca135.tar.gz
rails-61d5d2d8a97fd289b81991cd79dca3112e7ca135.tar.bz2
rails-61d5d2d8a97fd289b81991cd79dca3112e7ca135.zip
Merge pull request #7668 from Draiken/fix_issue_6497
Removing to_shorthand to fix #6497 Conflicts: actionpack/CHANGELOG.md
Diffstat (limited to 'activerecord/lib/active_record/integration.rb')
0 files changed, 0 insertions, 0 deletions