Merge pull request #34940 from nextcloud/feat/add-mastodon

author Carl Schwan <carl@carlschwan.eu>

Tue, 22 Nov 2022 16:47:04 +0000 (17:47 +0100)

committer GitHub <noreply@github.com>

Tue, 22 Nov 2022 16:47:04 +0000 (17:47 +0100)
author Carl Schwan <carl@carlschwan.eu>
Tue, 22 Nov 2022 16:47:04 +0000 (17:47 +0100)
committer GitHub <noreply@github.com>
Tue, 22 Nov 2022 16:47:04 +0000 (17:47 +0100)
diff --cc apps/provisioning_api/lib/Controller/AUserData.php
Simple merge
author	Carl Schwan <carl@carlschwan.eu>
	Tue, 22 Nov 2022 16:47:04 +0000 (17:47 +0100)
committer	GitHub <noreply@github.com>
	Tue, 22 Nov 2022 16:47:04 +0000 (17:47 +0100)