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

Authored by David Nelband <dnelband@gmail.com> on Jun 7 2019, 9:07 AM.

Description

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

Details

Committed
David Nelband <dnelband@gmail.com>Jun 7 2019, 9:07 AM
Parents
R767:f5ddbf9a7c55: Merge branch 'dev' of https://github.com/KDE/ocs-webserver into dev
R767:8c072add2eb4: notification
Branches
Unknown
Tags
Unknown
David Nelband <dnelband@gmail.com> committed R767:f124c1ebb1f0: Merge branch 'dev' of https://github.com/KDE/ocs-webserver into dev (authored by David Nelband <dnelband@gmail.com>).Jun 7 2019, 9:07 AM

Merged Changes

CommitAuthorDetailsCommitted
8c072add2eb4siyuandong
notification 
Jun 7 2019
d59ad14d2bb7siyuandong
notificatioin 
Jun 7 2019
a425a66e9d71ronaldv
is_show_real_domain_as_url 
Jun 7 2019