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