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

Authored by ronaldv on Jan 15 2019, 4:04 PM.

Description

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

Merged Changes

CommitAuthorDetailsCommitted
3e09f578f9fbdavid nelband
Merge branch 'dev' of git.kde.org:ocs-webserver into dev 
Jan 15 2019
3fc760f6b5c3david nelband
no message 
Jan 15 2019