Permalink
Browse files

Merge branch 'master' into develop

  • Loading branch information...
2 parents d3f2895 + 67564c4 commit 89f344340b3cb81ef86a4b1d6ad6c16ef56fe002 @jonathanchu committed Jul 30, 2011
Showing with 3 additions and 3 deletions.
  1. +3 −3 settings.py
View
@@ -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'),

0 comments on commit 89f3443

Please sign in to comment.