Merge branch 'develop' into feature/rules

2020-01-11 13:55:18 +01:00
parent 79afd29b19 1b13b92b21
commit 67c3c1e4a3
12 changed files with 207 additions and 8 deletions
--- a/rowsandall_app/settings.py
+++ b/rowsandall_app/settings.py
@@ -47,6 +47,7 @@ ALLOWED_HOSTS = CFG['allowed_hosts']

 INSTALLED_APPS = [
    'rowers',
+	'survey',
 #    'cvkbrno',
    'django.contrib.admin',
    'django.contrib.auth',