Merge pull request #22552 from nextcloud/bugfix/noid/opendocument-templates

author Morris Jobke <hey@morrisjobke.de>

Thu, 10 Sep 2020 10:42:29 +0000 (12:42 +0200)

committer GitHub <noreply@github.com>

Thu, 10 Sep 2020 10:42:29 +0000 (12:42 +0200)
author Morris Jobke <hey@morrisjobke.de>
Thu, 10 Sep 2020 10:42:29 +0000 (12:42 +0200)
committer GitHub <noreply@github.com>
Thu, 10 Sep 2020 10:42:29 +0000 (12:42 +0200)
diff --cc resources/config/mimetypemapping.dist.json
Simple merge
author	Morris Jobke <hey@morrisjobke.de>
	Thu, 10 Sep 2020 10:42:29 +0000 (12:42 +0200)
committer	GitHub <noreply@github.com>
	Thu, 10 Sep 2020 10:42:29 +0000 (12:42 +0200)