Merge branch 'master' into redesign
[rails.git] / config / .gitignore
1 application.yml
2 database.yml