merge everything back from mainline branch

[selectricity-live] / .bzrignore

diff --git a/.bzrignore b/.bzrignore
index 50c7c5ba8cc8ca7b0f3545691aeffc39ad617653..42f2b24ae1e026d9f320403cc576219156ff5d46 100644 (file)
--- a/.bzrignore
+++ b/.bzrignore
@@ -5,3 +5,10 @@ server.log
 test.log
 tmp
 public/engine_files
 test.log
 tmp
 public/engine_files

+.DS_Store
+vendor/plugins/sitealizer/lib/last_update
+public/pictures
+public/skin_pictures
+public/pictures
+help
+public/pictures/0000