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

Authored by ronaldv on Jun 7 2019, 7:40 AM.

Description

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

Details

Committed
ronaldvJun 7 2019, 7:40 AM
Parents
R767:e3bd617a77cb: is_show_real_domain_as_url
R767:77f9a07de3d6: cat tree fix
Branches
Unknown
Tags
Unknown

Merged Changes

CommitAuthorDetailsCommitted
77f9a07de3d6David Nelband
cat tree fix 
Jun 6 2019
6b894cbd0b09David Nelband
cat tree 
Jun 6 2019
e75973844259David Nelband
cat tree 
Jun 6 2019
8b8534d3a06aDavid Nelband
Merge branch 'dev' of https://github.com/KDE/ocs-webserver into dev 
Jun 6 2019
91bb635ea672David Nelband
cat tree 
Jun 6 2019