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

Authored by ronaldv on Dec 11 2018, 4:03 PM.

Description

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

Details

Committed
ronaldvDec 11 2018, 4:03 PM
Parents
R767:4e9123a081a9: metaheader
R767:83e25b3fadb2: no message
Branches
Unknown
Tags
Unknown

Merged Changes

CommitAuthorDetailsCommitted
83e25b3fadb2david nelband
no message 
Dec 11 2018
94f50566731ddavid nelband
no message 
Dec 11 2018
175d0fbbab40david nelband
no message 
Dec 11 2018
537a332de9d8david nelband
no message 
Dec 11 2018
c8ecc7dc0846david nelband
no message 
Dec 11 2018
b7aebb1da7badavid nelband
no message 
Dec 11 2018
262f75afb8d7david nelband
no message 
Dec 11 2018
477043c533e1david nelband
no message 
Dec 11 2018
3e5189389873david nelband
no message 
Dec 11 2018
24a57c741301david nelband
no message 
Dec 11 2018
a96b04570825david nelband
no message 
Dec 11 2018
ecbe68bdb61adavid nelband
no message 
Dec 11 2018
79a743b8954ddavid nelband
no message 
Dec 11 2018
845d0f10c9d3david nelband
Merge branch 'dev' of git.kde.org:ocs-webserver into dev 
Dec 11 2018
5ab89a0f04e8david nelband
no message 
Dec 11 2018