Merge tag 'v5.16' into develop

dev fix
2017-11-26 20:08:08 +01:00
parent 7fc5c8f35a 2ff4347f65
commit 8b565d9057
1 changed files with 1 additions and 1 deletions
--- a/rowsandall_app/settings.py
+++ b/rowsandall_app/settings.py
@@ -55,7 +55,7 @@ INSTALLED_APPS = [
    'django_rq',
    'django_rq_dashboard',
    'translation_manager',
-    'django_mailbox',
+#    'django_mailbox',
    'rest_framework',
    'rest_framework_swagger',
    'oauth2_provider',