Commit e858bcce authored by Markus Sommer's avatar Markus Sommer
Browse files

Merge branch 'develop' into 'activates-ldap-authentication'

# Conflicts:
#   html/typo3conf/LocalConfiguration.php
parents e25b191a 307e9888
Pipeline #1477 passed with stages
in 5 minutes and 38 seconds