merge from live

[selectricity-live] / .bzrignore

diff --git a/.bzrignore b/.bzrignore
old mode 100755 (executable)
new mode 100644 (file)
index 50c7c5b..5304d54
--- a/.bzrignore
+++ b/.bzrignore
@@ -5,3 +5,6 @@ server.log
 test.log
 tmp
 public/engine_files
 test.log
 tmp
 public/engine_files

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