Merge branch 'master' into owncloud
authorDominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Tue, 10 Sep 2019 09:03:39 +0000 (11:03 +0200)
committerGitHub <noreply@github.com>
Tue, 10 Sep 2019 09:03:39 +0000 (11:03 +0200)
commit4edab98b581eabf22cef9da49e213522b5b15150
tree9360226abe54f5b86365f5276ec9acffb882c4d0
parentddf1ac04e58f023c0d24ef1b50a99945f97c84b9
parent81bcb46ef2d9e978ac983dba6216dbd9920f89cc
Merge branch 'master' into owncloud