merge everything back from mainline branch

[selectricity-live] / .bzrignore

diff --git a/.bzrignore b/.bzrignore
index 5304d54136103c673695551947c79d3753d355c9..42f2b24ae1e026d9f320403cc576219156ff5d46 100644 (file)
--- a/.bzrignore
+++ b/.bzrignore
@@ -8,3 +8,7 @@ public/engine_files
 .DS_Store
 vendor/plugins/sitealizer/lib/last_update
 public/pictures
+public/skin_pictures
+public/pictures
+help
+public/pictures/0000