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

[rails.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 920ca1120ba51aa6171900e39560d36c48d1343f..1a2d35c6a28cc056de2646690384138a52a03caf 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 log
 config/piwik.yml
 log
 config/piwik.yml

+app/assets/javascripts/i18n

 public/assets
 public/attachments
 public/export
 public/assets
 public/attachments
 public/export