diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-08-21 14:10:33 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-08-21 14:36:04 -0300 |
| commit | 648c5a1369ed64608c3ca43a5ebc917687d20010 (patch) | |
| tree | 834ad77d7aec2718cb6148e6ec6cd0a42a9012fc /activerecord/test/models/country.rb | |
| parent | c091fae21f32250b19475f124c3b680dbbc163d9 (diff) | |
| download | rails-648c5a1369ed64608c3ca43a5ebc917687d20010.tar.gz rails-648c5a1369ed64608c3ca43a5ebc917687d20010.tar.bz2 rails-648c5a1369ed64608c3ca43a5ebc917687d20010.zip | |
Merge pull request #5210 from Pliny/masteri
Fix for #5200
Conflicts:
activerecord/CHANGELOG.md
activerecord/lib/active_record/counter_cache.rb
Diffstat (limited to 'activerecord/test/models/country.rb')
0 files changed, 0 insertions, 0 deletions