Merge branch 'master' of github.com:zotonic/zotonic

zotonic · Aug 21, 2012 · c4d07c1 · c4d07c1
2 parents 321fd51 + 3d828f7
commit c4d07c1
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/priv/sites/.gitignore b/priv/sites/.gitignore
@@ -0,0 +1,3 @@
+*
+!testsandbox/
+!zotonic_status/