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

Authored by ronaldv on Mar 21 2019, 1:49 PM.

Description

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

Details

Committed
ronaldvMar 21 2019, 1:49 PM
Parents
R767:c9629385dbeb: dl popup
R767:227df4ecffb9: metaheader
Branches
Unknown
Tags
Unknown

Merged Changes

CommitAuthorDetailsCommitted
227df4ecffb9siyuandong
metaheader 
Mar 21 2019
0543a8964348siyuandong
metaheader 
Mar 21 2019
80ea92781003siyuandong
i818 
Mar 21 2019