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

Authored by ronaldv on Jan 15 2019, 2:26 PM.

Description

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

Details

Committed
ronaldvJan 15 2019, 2:26 PM
Parents
R767:cbfae75d79f9: pling list
R767:29cd38ee9408: no message
Branches
Unknown
Tags
Unknown

Merged Changes

CommitAuthorDetailsCommitted
29cd38ee9408david nelband
no message 
Jan 15 2019
3356c10afae9david nelband
no message 
Jan 15 2019
c57036450ebfdavid nelband
no message 
Jan 15 2019
40aecd1dbd03david nelband
no message 
Jan 15 2019
9f0459e18823david nelband
Merge branch 'dev' of git.kde.org:ocs-webserver into dev 
Jan 15 2019
06ff05cafc8adavid nelband
no message 
Jan 15 2019
f40ade69a7d6siyuandong
stati 
Jan 15 2019
b875c87c8d98siyuandong
stati 
Jan 15 2019
5e7735a768e9david nelband
Merge branch 'dev' of git.kde.org:ocs-webserver into dev 
Jan 15 2019
5d599468c42ddavid nelband
no message 
Jan 15 2019