Merge branch 'master' into development

2014-09-05 14:40:39 -04:00
parent 5caf616707 77f7245766
commit febfb1d74c
9 changed files with 90 additions and 6 deletions
--- a/mayan/settings/local.py
+++ b/mayan/settings/local.py
@@ -0,0 +1,3 @@
+from __future__ import absolute_import
+
+from .base import *
--- a/mayan/settings/production.py
+++ b/mayan/settings/production.py
@@ -3,4 +3,3 @@ from .local import *

 DEBUG = False
 ALLOWED_HOSTS = ['*']  # Update this accordingly; https://docs.djangoproject.com/en/dev/ref/settings/#allowed-hosts
-~