Merge branch 'feature-coffee-upgrade' into 'develop'

Feature coffee upgrade See merge request vtmk/web2.0!92
2017-11-01 13:14:44 +02:00
parent e63f8d5418 b8fd237918
commit 2f80159144
10 changed files with 153 additions and 247 deletions
@@ -78,7 +78,7 @@ INSTALLED_APPS = [
    'webapp',
    'members',
    'infoscreen',
-    'coffee_scale.apps.CoffeeScaleConfig',
+    'coffee_scale',
    'rest_framework',
    'django_nose',
    'bootstrap3',