Doing a resync from mainline 8633:10895. There was one simple to resolve conflict...

[rails.git] / db / migrate / 016_add_timestamp_indexes.rb

diff --git a/db/migrate/012_add_timestamp_indexes.rb b/db/migrate/016_add_timestamp_indexes.rb
similarity index 100%
rename from db/migrate/012_add_timestamp_indexes.rb
rename to db/migrate/016_add_timestamp_indexes.rb