e68bfaf1fe
Conflicts: activerecord/lib/active_record/base.rb railties/lib/rails/configuration.rb railties/lib/rails/log_subscriber.rb |
||
---|---|---|
.. | ||
generators | ||
rails | ||
rails.rb |
e68bfaf1fe
Conflicts: activerecord/lib/active_record/base.rb railties/lib/rails/configuration.rb railties/lib/rails/log_subscriber.rb |
||
---|---|---|
.. | ||
generators | ||
rails | ||
rails.rb |