tree bbd2ad303afa08ceb6d4f43a23e49678e87e19d7
parent 02a59c945c3b565c9d62d6e2fbb41de711bc29ca
author Simon Reis <simon.reis@pta.de> 1582038962 +0100
committer Simon Reis <simon.reis@pta.de> 1582038962 +0100

Merge branch 'KON-599_disable_ldap' into DEVELOP