merge from live

[selectricity-live] / .bzrignore

diff --git a/.bzrignore b/.bzrignore
index 57a67d22f4ea29e16bc9f66a67611b06fdd8fbd6..5304d54136103c673695551947c79d3753d355c9 100644 (file)
--- a/.bzrignore
+++ b/.bzrignore
@@ -7,3 +7,4 @@ tmp
 public/engine_files
 .DS_Store
 vendor/plugins/sitealizer/lib/last_update
 public/engine_files
 .DS_Store
 vendor/plugins/sitealizer/lib/last_update

+public/pictures