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

Authored by ronaldv on May 17 2019, 2:49 PM.

Description

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

Merged Changes

CommitAuthorDetailsCommitted
7b83916ff3eaDavid Nelband
Merge branch 'dev' of https://github.com/KDE/ocs-webserver into dev 
May 17 2019
d6dfff1cdc3aDavid Nelband
pms fix 
May 17 2019