Merge branch 'master' into reference_coding_style_wiki_page
authorFelix Weilbach <felix.weilbach@nextcloud.com>
Thu, 14 Jan 2021 17:49:55 +0000 (09:49 -0800)
committerGitHub <noreply@github.com>
Thu, 14 Jan 2021 17:49:55 +0000 (09:49 -0800)

Trivial merge