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

Authored by David Nelband <dnelband@gmail.com> on Dec 5 2019, 1:55 PM.

Description

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

Details

Committed
David Nelband <dnelband@gmail.com>Dec 5 2019, 1:55 PM
Parents
R767:2a95f6b5b48c: pms book reader end button
R767:895692283bf4: aboutme
Branches
Unknown
Tags
Unknown
David Nelband <dnelband@gmail.com> committed R767:e5876286eeef: Merge branch 'dev' of https://github.com/KDE/ocs-webserver into dev (authored by David Nelband <dnelband@gmail.com>).Dec 5 2019, 1:55 PM

Merged Changes

CommitAuthorDetailsCommitted
895692283bf4siyuandong
aboutme 
Dec 5 2019
7c8542fa2c82siyuandong
backend category tagrating 
Dec 5 2019