Merge branch 'dev' of https://github.com/KDE/ocs-webserver into dev

Authored by ronaldv on Dec 5 2018, 2:19 PM.