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

Authored by ronaldv on Nov 28 2019, 10:43 AM.

Description

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

Details

Committed
ronaldvNov 28 2019, 10:43 AM
Parents
R767:67c7f9f5d35e: torrent
R767:1514f1565b8e: featured activities
Branches
Unknown
Tags
Unknown

Merged Changes

CommitAuthorDetailsCommitted
1514f1565b8esiyuandong
featured activities 
Nov 28 2019