diff options
| author | Xavier Noria <fxn@hashref.com> | 2014-02-06 15:03:20 +0100 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2014-02-06 15:03:20 +0100 |
| commit | c0fb8d0b9c4d55770f7ce1a9cb62e4f2a75ca3ee (patch) | |
| tree | 66bfa9ed07cc0ef7e82552eebac49a5b5d8838b5 /activerecord/test/fixtures/ships.yml | |
| parent | 7f648bc70e76b7a386a41f882ddd97105334f590 (diff) | |
| parent | 8806768e9f1a2648085f7826d9a0032457182bdb (diff) | |
| download | rails-c0fb8d0b9c4d55770f7ce1a9cb62e4f2a75ca3ee.tar.gz rails-c0fb8d0b9c4d55770f7ce1a9cb62e4f2a75ca3ee.tar.bz2 rails-c0fb8d0b9c4d55770f7ce1a9cb62e4f2a75ca3ee.zip | |
Merge branch 'dump-schema-after-migration-flag' of git://github.com/emilsoman/rails into emilsoman-dump-schema-after-migration-flag
Conflicts:
activerecord/CHANGELOG.md
Diffstat (limited to 'activerecord/test/fixtures/ships.yml')
0 files changed, 0 insertions, 0 deletions