fergalmoran/dss.api
1
0
Fork 0
mirror of https://github.com/fergalmoran/dss.api.git synced 2025-12-25 18:58:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge conflicts

Browse Source
This commit is contained in:
Fergal Moran
2015-11-11 00:12:46 +00:00
parent ba79ebe44f 4a98536ddb
commit e1ba06955b
36 changed files with 473 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
dss/settings.py
View File

@@ -171,12 +171,7 @@ if DEBUG:
REALTIME_HEADERS = {
'content-type': 'application/json'
}
TEST_RUNNER = 'django_nose.NoseTestSuiteRunner'
if 'test' in sys.argv:
try:
from .test_settings import *
except ImportError:
pass
REST_FRAMEWORK = {
# Use hyperlinked styles by default.