Merge branch 'develop' into feature/restapi

2016-12-21 13:23:28 +01:00
parent cd151a7267 2e4a5c0621
commit 24c166a5d3
5 changed files with 50 additions and 2 deletions
--- a/rowsandall_app/settings.py
+++ b/rowsandall_app/settings.py
@@ -52,6 +52,7 @@ INSTALLED_APPS = [
    'oauth2_provider',
    'corsheaders',
    'analytical',
+    'cookielaw'
 ]

 AUTHENTICATION_BACKENDS = (