diff options
| author | ecoologic <erikecoologic@gmail.com> | 2014-10-07 23:17:56 +1000 |
|---|---|---|
| committer | ecoologic <erikecoologic@gmail.com> | 2014-10-07 23:17:56 +1000 |
| commit | 117f09c5d1eb600908001bb7b5ee353756e56456 (patch) | |
| tree | 717d45020cf652840f90c09579692e30bf31237b /activerecord/test/config.example.yml | |
| parent | 8caf16a281260fedb0677c85047469e99c48da94 (diff) | |
| parent | 75780373af9a3ddd4cc1bda3d4dbfe6121102b2e (diff) | |
| download | rails-117f09c5d1eb600908001bb7b5ee353756e56456.tar.gz rails-117f09c5d1eb600908001bb7b5ee353756e56456.tar.bz2 rails-117f09c5d1eb600908001bb7b5ee353756e56456.zip | |
Merge remote-tracking branch 'origin/master' into guides-template-inheritance
Diffstat (limited to 'activerecord/test/config.example.yml')
| -rw-r--r-- | activerecord/test/config.example.yml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/activerecord/test/config.example.yml b/activerecord/test/config.example.yml index a54914c372..ce30cff9e7 100644 --- a/activerecord/test/config.example.yml +++ b/activerecord/test/config.example.yml @@ -55,6 +55,7 @@ connections: arunit: username: rails encoding: utf8 + collation: utf8_unicode_ci arunit2: username: rails encoding: utf8 @@ -63,6 +64,7 @@ connections: arunit: username: rails encoding: utf8 + collation: utf8_unicode_ci arunit2: username: rails encoding: utf8 |