Merge develop to feature-excel-import-export

2017-11-02 15:15:41 +02:00
parent b9e9cdb2b0 e0e73976db
commit 29070165eb
42 changed files with 527 additions and 497 deletions
@@ -78,7 +78,7 @@ INSTALLED_APPS = [
    'webapp',
    'members',
    'infoscreen',
-    'coffee_scale.apps.CoffeeScaleConfig',
+    'coffee_scale',
    'rest_framework',
    'django_nose',
    'bootstrap3',
@@ -86,6 +86,7 @@ INSTALLED_APPS = [
    'auditlog',
    'phonenumber_field',
    'import_export',
+    'password_reset',
 ]

 IMPORT_EXPORT_USE_TRANSACTIONS = True