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

Authored by ronaldv on May 28 2019, 2:43 PM.

Description

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

Details

Committed
ronaldvMay 28 2019, 2:43 PM
Parents
R767:afc0abb9580e: dl
R767:cef6791b24ea: category tree fix
Branches
Unknown
Tags
Unknown

Merged Changes

CommitAuthorDetailsCommitted
cef6791b24eaDavid Nelband
category tree fix 
May 28 2019
5ca965220e0aDavid Nelband
category tree 
May 28 2019
915c48beb9bfDavid Nelband
category tree 
May 28 2019
2f011c389bcfDavid Nelband
category tree fix 
May 28 2019
884296fde1ddDavid Nelband
category tree 
May 28 2019
efaec8364d1fDavid Nelband
category tree 
May 28 2019
932eb3fcaca9David Nelband
category tree new 
May 28 2019
ae4041538e17David Nelband
categories slider 
May 27 2019
9af52ec5c64eDavid Nelband
category tree basic 
May 27 2019
8f8b8d86241eDavid Nelband
ct 
May 27 2019
10acd66af1acDavid Nelband
Merge branch 'dev' of https://github.com/KDE/ocs-webserver into dev 
May 27 2019
6bf5733edaa6David Nelband
ct 
May 27 2019
38be889d74ffsiyuandong
osuser 
May 27 2019