diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-06-02 12:36:36 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-06-02 12:36:36 -0300 |
| commit | fd3c55f09fdfb45c33a5383af2c0b9ddf8f63e90 (patch) | |
| tree | 89f6b8eeae81ba9e9f3c43667b234b64a776e649 /activerecord/test/models/ship.rb | |
| parent | 5255a81b808c2c947d58df979e6436b1fe1d8157 (diff) | |
| parent | 196f780e30fcece25e4d09c12f9b9f7374ebed29 (diff) | |
| download | rails-fd3c55f09fdfb45c33a5383af2c0b9ddf8f63e90.tar.gz rails-fd3c55f09fdfb45c33a5383af2c0b9ddf8f63e90.tar.bz2 rails-fd3c55f09fdfb45c33a5383af2c0b9ddf8f63e90.zip | |
Merge commit 'rails/master'
Conflicts:
activerecord/lib/active_record.rb
Diffstat (limited to 'activerecord/test/models/ship.rb')
0 files changed, 0 insertions, 0 deletions