Master
Files
22- Matthias Meusburger authored
Merge remote-tracking branch 'origin/stable' into hotline-master Conflicts: VERSIONS library/startup.php
Merge remote-tracking branch 'origin/stable' into hotline-master Conflicts: VERSIONS library/startup.php