merge from live

[selectricity-live] / .bzrignore

diff --git a/.bzrignore b/.bzrignore
index 2371a0a9a03fb5571eb95d216993924198bcc0bd..5304d54136103c673695551947c79d3753d355c9 100644 (file)
--- a/.bzrignore
+++ b/.bzrignore
@@ -3,3 +3,8 @@ 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
+public/pictures