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)
commit60a3c27d8489f203047b70ce752cb690960d090e
tree9edaf8e5d049de7ed4af0e435d584f2e316f5d47
parentb8277355ec970bd6279228ce419c6c05e80eef6a
parent314f7140821e0478e6cf40ac7ae4f5776a699efe
Merge branch 'master' into reference_coding_style_wiki_page