merge from live

[selectricity-live] / .bzrignore

diff --git a/.bzrignore b/.bzrignore
index 50c7c5ba8cc8ca7b0f3545691aeffc39ad617653..5304d54136103c673695551947c79d3753d355c9 100644 (file)
--- a/.bzrignore
+++ b/.bzrignore
@@ -5,3 +5,6 @@ server.log
 test.log
 tmp
 public/engine_files
+.DS_Store
+vendor/plugins/sitealizer/lib/last_update
+public/pictures