diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2012-04-23 16:30:38 -0700 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2012-04-23 16:30:38 -0700 |
| commit | db6787af681a74499339bc4b9f83d817c6353410 (patch) | |
| tree | 5451715ba849f0db9e121ef9e6591eb8545241da /railties/.gitignore | |
| parent | 0f5af608d99c6086ed95798bf93b44f4254f7c18 (diff) | |
| parent | 0f3fd78953104c010edfd971e5f7da2efcd43def (diff) | |
| download | rails-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 'railties/.gitignore')
0 files changed, 0 insertions, 0 deletions