Merge branch 'master' into guardian

# Conflicts: # Pipfile # Pipfile.lock # passbook/core/models.py
2019-10-10 17:27:52 +02:00
parent 344a8817c3 c782585287
commit 143a575369
24 changed files with 188 additions and 40 deletions
--- a/passbook/root/settings.py
+++ b/passbook/root/settings.py
@ -74,6 +74,7 @@ INSTALLED_APPS = [
    'passbook.api.apps.PassbookAPIConfig',
    'passbook.lib.apps.PassbookLibConfig',
    'passbook.audit.apps.PassbookAuditConfig',
+    'passbook.recovery.apps.PassbookRecoveryConfig',

    'passbook.sources.ldap.apps.PassbookSourceLDAPConfig',
    'passbook.sources.oauth.apps.PassbookSourceOAuthConfig',