Merge branch 'master' into develop

This commit is contained in:
Martin Mahner 2013-03-22 19:49:14 +01:00
commit 4a2ddc4e99

View file

@ -19,8 +19,8 @@ SECRET_KEY = ''
ALLOWED_HOSTS = (
'dpaste.de',
'www.dpaste.de',
'localhost',
'127.0.0.1',
'dpaste.org',
'www.dpaste.org',
)
#==============================================================================