Jens Langhammer 920858ff72 Merge branch 'master' into otp-rework ...

# Conflicts:
#	passbook/flows/models.py
#	passbook/stages/otp/models.py
#	swagger.yaml

2020-06-29 22:54:18 +02:00

..

ldap

sources/ldap: fix 'LDAPSource' object has no attribute '_connection'

2020-06-09 01:17:17 +02:00

oauth

Merge branch 'master' into otp-rework

2020-06-29 22:54:18 +02:00

saml

flows: update migrations to use update_or_create

2020-06-29 16:19:39 +02:00

__init__.py

ci(minor): re-enable pylint

2019-10-10 17:22:56 +02:00