Merge branch 'develop' into feature/restapi

2016-12-16 14:09:52 +01:00
parent 170d0e43a1 c15ece930a
commit 846f1c0dfd
5 changed files with 214 additions and 6 deletions
--- a/rowsandall_app/settings.py
+++ b/rowsandall_app/settings.py
@@ -51,6 +51,7 @@ INSTALLED_APPS = [
    'rest_framework_swagger',
    'oauth2_provider',
    'corsheaders',
+    'analytical',
 ]

 AUTHENTICATION_BACKENDS = (
@@ -278,3 +279,7 @@ REST_FRAMEWORK = {
    'PAGE_SIZE': 20,
 }

+# Analytics
+
+CLICKY_SITE_ID = '101011008'
+