Merge branch 'feature-rake-pipeline' into develop

ethul · Mar 20, 2012 · 2e920a7 · 2e920a7
2 parents 8d86f97 + 4036713
commit 2e920a7
Show file tree

Hide file tree

Showing 25 changed files with 134 additions and 813 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
 *.swp
-assets/*.*.css
 *.html
-!404.html
+public
+tmp