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

Authored by ronaldv on Feb 27 2019, 11:06 AM.

Description

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

Details

Committed
ronaldvFeb 27 2019, 11:06 AM
Parents
R767:7ab55f54b07e: logo
R767:93e6a124484e: fix
Branches
Unknown
Tags
Unknown

Merged Changes

CommitAuthorDetailsCommitted
93e6a124484esiyuandong
fix 
Feb 26 2019
88becab8d962siyuandong
headerfix 
Feb 26 2019