Merge branch 'master' into develop

jonathanchu · Jul 30, 2011 · 89f3443 · 89f3443
2 parents d3f2895 + 67564c4
commit 89f3443
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/settings.py b/settings.py
@@ -21,8 +21,8 @@
 ## DEBUGGING
 # ---------------------------------------------------------------------------
 
-DEBUG = False
-TEMPLATE_DEBUG = False
+DEBUG = True
+TEMPLATE_DEBUG = DEBUG
 
 ADMINS = (
     ('Jonathan Chu', 'jc@3atmospheres.com'),
@@ -65,7 +65,7 @@
 ## STATIC
 # ---------------------------------------------------------------------------
 
-STATIC_ROOT = ''
+STATIC_ROOT = './static/'
 STATIC_URL = '/static/'
 STATICFILES_DIRS = (
     join(PROJECT, 'static'),