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

[rails.git] / config / .gitignore

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