Commit 86d9389b authored by Till Brehm's avatar Till Brehm
Browse files

Merge branch 'develop' into 'develop'

# Conflicts:
#   interface/web/login/index.php
parents c1250ee2 27db86c9
Pipeline #12292 passed with stage
in 13 seconds