Merge branch 'master' into owncloud
authorDominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Tue, 10 Sep 2019 11:11:02 +0000 (13:11 +0200)
committerGitHub <noreply@github.com>
Tue, 10 Sep 2019 11:11:02 +0000 (13:11 +0200)
commitcd5ff96904c8e24ebbdf30f616ad935ebbccab23
treef69033e9165341d196ff15156a733a9c1e87c0aa
parent4edab98b581eabf22cef9da49e213522b5b15150
parent24a20ec7587483638a7b31cfee22528181734102
Merge branch 'master' into owncloud