Merge branch 'master' of gitssh://web.xkjq.uk:30001/ross/rad

rad/settings.py

@@ -50,6 +50,7 @@ INSTALLED_APPS = [
     'django.contrib.staticfiles',
     'debug_toolbar',
     "tagulous",
+    "dbbackup",
 ]
 
 MIDDLEWARE = [
@@ -199,8 +200,14 @@ THUMBNAIL_ALIASES = {
 }
 
 THUMBNAIL_SOURCE_GENERATORS = ('easy_thumbnails.source_generators.pil_image', 'helpers.images.pil_dicom_image')
+DBBACKUP_STORAGE = 'django.core.files.storage.FileSystemStorage'
+DBBACKUP_STORAGE_OPTIONS = {'location': os.path.join(BASE_DIR, '../backups')}
 
 try:
     from .settings_local import *
 except ImportError:
     pass
+<<<<<<< HEAD
+=======
+
+>>>>>>> 5763aae287cbceee318f975495f7d9429517c88f