merge from live

[selectricity-live] / .bzrignore

diff --git a/.bzrignore b/.bzrignore
index d2da80804ce572d300f6ad75a209f1da2d77b318..5304d54136103c673695551947c79d3753d355c9 100644 (file)
--- a/.bzrignore
+++ b/.bzrignore
@@ -4,3 +4,7 @@ production.log
 server.log
 test.log
 tmp
 server.log
 test.log
 tmp

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