activerecord/test/fixtures/friendships.yml · v3.2.19.github6 · Rails relative code / rails-deleted-2

Aug 21, 2012
648c5a13
Merge pull request #5210 from Pliny/masteri · 648c5a13
Rafael Mendonça França authored Aug 21, 2012
```
Fix for #5200

Conflicts:
	activerecord/CHANGELOG.md
	activerecord/lib/active_record/counter_cache.rb
```
648c5a13
Merge pull request #5210 from Pliny/masteri
Rafael Mendonça França authored Aug 21, 2012
```
Fix for #5200

Conflicts:
	activerecord/CHANGELOG.md
	activerecord/lib/active_record/counter_cache.rb
```