Merge jdong

[selectricity] / .bzrignore

diff --git a/.bzrignore b/.bzrignore
index 2371a0a9a03fb5571eb95d216993924198bcc0bd..57a67d22f4ea29e16bc9f66a67611b06fdd8fbd6 100644 (file)
--- a/.bzrignore
+++ b/.bzrignore
@@ -3,3 +3,7 @@ development.log
 production.log
 server.log
 test.log
 production.log
 server.log
 test.log

+tmp
+public/engine_files
+.DS_Store
+vendor/plugins/sitealizer/lib/last_update