merged in changes from live version

[selectricity-live] / .bzrignore

diff --git a/.bzrignore b/.bzrignore
index b5649dd032e81aa0bf153efcb1d90e9bbfe20df4..42f2b24ae1e026d9f320403cc576219156ff5d46 100644 (file)
--- a/.bzrignore
+++ b/.bzrignore
@@ -1 +1,14 @@
 database.yml
+development.log
+production.log
+server.log
+test.log
+tmp
+public/engine_files
+.DS_Store
+vendor/plugins/sitealizer/lib/last_update
+public/pictures
+public/skin_pictures
+public/pictures
+help
+public/pictures/0000