Merge branch 'master' into feature/github-auth

Conflicts:
	README.md
This commit is contained in:
Jonas Obrist 2012-08-18 03:05:00 +02:00
commit 7656693360
5 changed files with 21 additions and 16 deletions

View file

@ -13,6 +13,9 @@ LANGUAGE_CODE = 'en'
SITE_ID = 1
assert 'SECRET_KEY' in os.environ, 'Set SECRET_KEY in your .env file!'
SECRET_KEY = os.environ['SECRET_KEY']
USE_L10N = USE_I18N = False
MEDIA_ROOT = os.path.join(PROJECT_DIR, 'media')