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