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

[rails.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index edfd387abad0782b71b6af3401935aad2df2ef37..1a2d35c6a28cc056de2646690384138a52a03caf 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 log
 config/piwik.yml
+app/assets/javascripts/i18n
 public/assets
 public/attachments
 public/export
@@ -10,4 +11,5 @@ doc
 .vagrant
 .ruby-gemset
 .ruby-version
-.idea
\ No newline at end of file
+.idea
+coverage