mirror of
https://github.com/github/rails.git
synced 2026-01-08 22:27:56 -05:00
Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb activerecord/test/cases/schema_dumper_test.rb