Merge routes change

[selectricity-live] / .bzrignore

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

+development.log
+production.log
+server.log
+test.log
+tmp
+public/engine_files
+.DS_Store