merge from live

[selectricity-live] / .bzrignore

diff --git a/.bzrignore b/.bzrignore
index b5649dd032e81aa0bf153efcb1d90e9bbfe20df4..5304d54136103c673695551947c79d3753d355c9 100644 (file)
--- a/.bzrignore
+++ b/.bzrignore
@@ -1 +1,10 @@
 database.yml
 database.yml

+development.log
+production.log
+server.log
+test.log
+tmp
+public/engine_files
+.DS_Store
+vendor/plugins/sitealizer/lib/last_update
+public/pictures