Merge branch 'dev' of git.kde.org:ocs-webserver into dev

Authored by david nelband <dnelband@gmail.com> on Dec 12 2018, 11:05 AM.

Description

Merge branch 'dev' of git.kde.org:ocs-webserver into dev

Details

Committed
david nelband <dnelband@gmail.com>Dec 12 2018, 11:05 AM
Parents
R767:eb509576d29a: no message
R767:f66a3c985290: issue
Branches
Unknown
Tags
Unknown
david nelband <dnelband@gmail.com> committed R767:78cc317af1bf: Merge branch 'dev' of git.kde.org:ocs-webserver into dev (authored by david nelband <dnelband@gmail.com>).Dec 12 2018, 11:05 AM

Merged Changes

CommitAuthorDetailsCommitted
f66a3c985290siyuandong
issue 
Dec 12 2018
8b45d3c2a1d3ronaldv
meta 
Dec 12 2018
063d40cb5593siyuandong
startpage 
Dec 12 2018
095a53e336bcalexanderschmidt
set subtree deleted when parent category deleted 
Dec 11 2018
dce815dc7486alexanderschmidt
discourse: new delete function 
Dec 11 2018