diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2017-01-11 15:15:13 +0000 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2017-01-11 15:15:13 +0000 |
| commit | 8898a0ae2a0d5c8826fe08bbf4ccd10745802f9e (patch) | |
| tree | 60f4624da0e7853186d8b9786dbb3263080791d0 /activerecord/test/cases/adapters/mysql2/connection_test.rb | |
| parent | e11f11f962f586cf84066ebbe667e409ae835c95 (diff) | |
| parent | 5c72675c73979901592cef0f2a482527782b2dfb (diff) | |
| download | rails-8898a0ae2a0d5c8826fe08bbf4ccd10745802f9e.tar.gz rails-8898a0ae2a0d5c8826fe08bbf4ccd10745802f9e.tar.bz2 rails-8898a0ae2a0d5c8826fe08bbf4ccd10745802f9e.zip | |
Merge branch 'master' of github.com:rails/docrails
Conflicts:
railties/lib/rails/generators.rb
Diffstat (limited to 'activerecord/test/cases/adapters/mysql2/connection_test.rb')
0 files changed, 0 insertions, 0 deletions