summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--greenbox/settings.py5
2 files changed, 6 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 668491e..6069760 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
1*.pyc 1*.pyc
2/greenbox/site_media/ 2/greenbox/site_media/
3/settings_local.py
diff --git a/greenbox/settings.py b/greenbox/settings.py
index d407cd0..a0096ed 100644
--- a/greenbox/settings.py
+++ b/greenbox/settings.py
@@ -60,3 +60,8 @@ INSTALLED_APPS = (
60 'south', 60 'south',
61 'recipe', 61 'recipe',
62) 62)
63
64try:
65 from settings_local import *
66except ImportError:
67 pass