Merge remote-tracking branch 'upstream/pull/2470'

[rails.git] / config / .gitignore

diff --git a/config/.gitignore b/config/.gitignore
index b5649dd032e81aa0bf153efcb1d90e9bbfe20df4..95ba2dbdbf92b85744545000c99cc1e97a21b6cc 100644 (file)
--- a/config/.gitignore
+++ b/config/.gitignore
@@ -1 +1,2 @@
 database.yml
 database.yml

+storage.yml