Merge mako

[selectricity-live] / .bzrignore

diff --git a/.bzrignore b/.bzrignore
index 50c7c5ba8cc8ca7b0f3545691aeffc39ad617653..1e24ca1b87d4ae5f09a2ecb818ea9d3fadf41bdc 100644 (file)
--- a/.bzrignore
+++ b/.bzrignore
@@ -5,3 +5,4 @@ server.log
 test.log
 tmp
 public/engine_files
+.DS_Store