Merge remote-tracking branch 'upstream/pull/2115'
[rails.git] / config / .gitignore
1 application.yml
2 database.yml