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

Authored by ronaldv on Feb 21 2019, 11:38 AM.

Description

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

Details

Committed
ronaldvFeb 21 2019, 11:38 AM
Parents
R767:316efc2de339: context
R767:8a5aa374e82f: add riot menu
Branches
Unknown
Tags
Unknown

Merged Changes

CommitAuthorDetailsCommitted
8a5aa374e82fsiyuandong
add riot menu 
Feb 21 2019
35131d4d80bcsiyuandong
add riot menu 
Feb 21 2019