aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2012-04-23 16:30:38 -0700
committerSantiago Pastorino <santiago@wyeworks.com>2012-04-23 16:30:38 -0700
commitdb6787af681a74499339bc4b9f83d817c6353410 (patch)
tree5451715ba849f0db9e121ef9e6591eb8545241da /activerecord
parent0f5af608d99c6086ed95798bf93b44f4254f7c18 (diff)
parent0f3fd78953104c010edfd971e5f7da2efcd43def (diff)
downloadrails-db6787af681a74499339bc4b9f83d817c6353410.tar.gz
rails-db6787af681a74499339bc4b9f83d817c6353410.tar.bz2
rails-db6787af681a74499339bc4b9f83d817c6353410.zip
Merge pull request #5946 from sikachu/3-2-stable-fix-merge-conflict
Fix broken test from the earlier merge conflict
Diffstat (limited to 'activerecord')
0 files changed, 0 insertions, 0 deletions