merged fixes from devel

[selectricity-live] / .bzrignore

diff --git a/.bzrignore b/.bzrignore
index 1e24ca1b87d4ae5f09a2ecb818ea9d3fadf41bdc..42f2b24ae1e026d9f320403cc576219156ff5d46 100644 (file)
--- a/.bzrignore
+++ b/.bzrignore
@@ -6,3 +6,9 @@ test.log
 tmp
 public/engine_files
 .DS_Store
 tmp
 public/engine_files
 .DS_Store

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