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

Authored by David Nelband <dnelband@gmail.com> on Dec 3 2019, 11:50 AM.

Description

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

Details

Committed
David Nelband <dnelband@gmail.com>Dec 3 2019, 11:50 AM
Parents
R767:dae110d6f450: pms book reader console.log
R767:c410cbdfd456: app supporters
Branches
Unknown
Tags
Unknown
David Nelband <dnelband@gmail.com> committed R767:5c2abd026f1c: Merge branch 'dev' of https://github.com/KDE/ocs-webserver into dev (authored by David Nelband <dnelband@gmail.com>).Dec 3 2019, 11:50 AM

Merged Changes

CommitAuthorDetailsCommitted
c410cbdfd456siyuandong
app supporters 
Dec 3 2019
b0fd85c7999dronaldv
dangerous 
Dec 3 2019
4b8c22dec58bronaldv
Merge branch 'dev' of https://github.com/KDE/ocs-webserver into dev 
Dec 3 2019
d4310d22116eronaldv
dangerous 
Dec 3 2019