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

Authored by ronaldv on Mar 1 2019, 3:36 PM.

Description

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

Details

Committed
ronaldvMar 1 2019, 3:36 PM
Parents
R767:6ce1a649b249: comment
R767:cc71b573c808: sql
Branches
Unknown
Tags
Unknown

Merged Changes

CommitAuthorDetailsCommitted
cc71b573c808siyuandong
sql 
Mar 1 2019