tree 92bff38c92c04ac94ec69b5aa8a2ff07f6b1a736
parent 39adfe810fc3daa373f3bc35a2141004ea9717dc
author Simon Reis <simon.reis@pta.de> 1582061158 +0100
committer Simon Reis <simon.reis@pta.de> 1582061158 +0100

Merge branch 'KON-599_disable_ldap' into DEVELOP