fergalmoran/dss.api
1
0
Fork 0
mirror of https://github.com/fergalmoran/dss.api.git synced 2025-12-26 03:09:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed merge conflicts

Browse Source
This commit is contained in:
Fergal Moran
2015-11-08 20:27:06 +00:00
parent 08241d3127 02861ac79e
commit eda5a2d6c0
9 changed files with 182 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dss/settings.py
View File

@@ -13,10 +13,12 @@ from dss.storagesettings import *
from dss.paymentsettings import *
from dss.logsettings import *
from dss.psa import *
from dss.celerysettings import *
DEVELOPMENT = DEBUG
TEMPLATE_DEBUG = DEBUG
VERSION = '2.13.01'
ADMINS = (
('Fergal Moran', 'fergal.moran@gmail.com'),