Merge remote-tracking branch 'upstream/master' into vagrant

[rails.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 2e7dfe16e7b101f26c708360b2bea178062a91dc..e507f9430496225b457220ff16ca916d1ac319bf 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,10 @@
 log
 log

+config/piwik.yml

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

+public/export

 tmp
 .DS_Store
 *~
 tmp
 .DS_Store
 *~

+doc
+.vagrant