aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/models
diff options
context:
space:
mode:
authorEmilio Tagua <miloops@gmail.com>2009-08-10 10:40:11 -0300
committerEmilio Tagua <miloops@gmail.com>2009-08-10 10:40:11 -0300
commiteb3ae44ccaff1dc63eb31bf86d8db07c88ddc413 (patch)
tree9997bd3739e30fad0102a22e8feee40c4c4c835c /activerecord/test/models
parent952014315926d370f2a0b681cb765948bf2e6883 (diff)
parent5786395760f1e1906c878df4023cac3741e66e87 (diff)
downloadrails-eb3ae44ccaff1dc63eb31bf86d8db07c88ddc413.tar.gz
rails-eb3ae44ccaff1dc63eb31bf86d8db07c88ddc413.tar.bz2
rails-eb3ae44ccaff1dc63eb31bf86d8db07c88ddc413.zip
Merge commit 'rails/master'
Conflicts: activerecord/lib/active_record/migration.rb
Diffstat (limited to 'activerecord/test/models')
0 files changed, 0 insertions, 0 deletions