merge from live

[selectricity-live] / .bzrignore

diff --git a/.bzrignore b/.bzrignore
index 1ef4de884f5cc39c975e05415327863b693ce328..5304d54136103c673695551947c79d3753d355c9 100644 (file)
--- a/.bzrignore
+++ b/.bzrignore
@@ -1,2 +1,10 @@
 database.yml
-log
+development.log
+production.log
+server.log
+test.log
+tmp
+public/engine_files
+.DS_Store
+vendor/plugins/sitealizer/lib/last_update
+public/pictures