Merge from jdong

[selectricity-live] / .bzrignore

diff --git a/.bzrignore b/.bzrignore
index d2da80804ce572d300f6ad75a209f1da2d77b318..57a67d22f4ea29e16bc9f66a67611b06fdd8fbd6 100644 (file)
--- a/.bzrignore
+++ b/.bzrignore
@@ -4,3 +4,6 @@ production.log
 server.log
 test.log
 tmp
+public/engine_files
+.DS_Store
+vendor/plugins/sitealizer/lib/last_update