aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/relation
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@plataformatec.com.br>2012-06-10 02:39:27 -0700
committerJosé Valim <jose.valim@plataformatec.com.br>2012-06-10 02:39:27 -0700
commit6cc941dedbc435efa65cce896e7c6bf5fa519e99 (patch)
tree8ed713599af61ffbc374f157036b84019241ebcb /activerecord/lib/active_record/relation
parenteaeebc28840b06008aa9aa0e238cdc2331278a10 (diff)
parente66c240a8f46eba1f7d0816c9d72e5cb89f997da (diff)
downloadrails-6cc941dedbc435efa65cce896e7c6bf5fa519e99.tar.gz
rails-6cc941dedbc435efa65cce896e7c6bf5fa519e99.tar.bz2
rails-6cc941dedbc435efa65cce896e7c6bf5fa519e99.zip
Merge pull request #6693 from jkraemer/3-2-stable
Bugfix: Namespace collision with test-unit-activesupport 1.0.0
Diffstat (limited to 'activerecord/lib/active_record/relation')
0 files changed, 0 insertions, 0 deletions