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

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

Description

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

Details

Committed
ronaldvMar 1 2019, 3:53 PM
Parents
R767:1b7c569a4851: comment
R767:b8a13d88d85a: script.js
Branches
Unknown
Tags
Unknown

Merged Changes

CommitAuthorDetailsCommitted
b8a13d88d85asiyuandong
script.js 
Mar 1 2019