fergalmoran/dss.api
1
0
Fork 0
mirror of https://github.com/fergalmoran/dss.api.git synced 2026-01-03 15:13:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge conflicts

Browse Source
This commit is contained in:
Fergal Moran
2016-07-06 22:42:24 +01:00
parent 2f37783afd 7f7efee020
commit ecaa826d4f
15 changed files with 297 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
dss/settings.py
View File

@@ -124,12 +124,12 @@ INSTALLED_APPS = (
'pipeline',
#'dbbackup',
'gunicorn',
'corsheaders',
'sorl.thumbnail',
'djcelery',
'spa',
'gunicorn',
'spa.signals',
'core',
'storages',
@@ -253,7 +253,12 @@ SOCIAL_AUTH_AUTHENTICATION_BACKENDS = (
'social.backends.yahoo.YahooOpenId'
)
"""
DBBACKUP_STORAGE = 'dbbackup.storage.dropbox_storage'
DBBACKUP_TOKENS_FILEPATH = '._dss_tokens'
DBBACKUP_DROPBOX_APP_KEY = localsettings.DSS_DB_BACKUP_KEY
DBBACKUP_DROPBOX_APP_SECRET = localsettings.DSS_DB_BACKUP_SECRET
<<<<<<< HEAD
=======
"""
>>>>>>> develop