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

Authored by ronaldv on Nov 30 2018, 10:10 AM.

Description

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

Details

Committed
ronaldvNov 30 2018, 10:10 AM
Parents
R767:fd1bf43a50a4: supporters
R767:bc782845d8a3: updated login
Branches
Unknown
Tags
Unknown

Merged Changes

CommitAuthorDetailsCommitted
bc782845d8a3alexanderschmidt
updated login 
Nov 30 2018
d6ffd23df5a1siyuandong
fix 
Nov 30 2018