Merge remote-tracking branch 'upstream/2021.12-rc' into api-fixes

author Michael <heluecht@pirati.ca>

Mon, 29 Nov 2021 12:52:00 +0000 (12:52 +0000)

committer Michael <heluecht@pirati.ca>

Mon, 29 Nov 2021 12:52:00 +0000 (12:52 +0000)
author Michael <heluecht@pirati.ca>
Mon, 29 Nov 2021 12:52:00 +0000 (12:52 +0000)
committer Michael <heluecht@pirati.ca>
Mon, 29 Nov 2021 12:52:00 +0000 (12:52 +0000)
diff --cc src/Module/Api/Friendica/Group/Delete.php
Simple merge
diff --cc src/Module/Api/Friendica/Group/Update.php
Simple merge
author	Michael <heluecht@pirati.ca>
	Mon, 29 Nov 2021 12:52:00 +0000 (12:52 +0000)
committer	Michael <heluecht@pirati.ca>
	Mon, 29 Nov 2021 12:52:00 +0000 (12:52 +0000)
		1	2
src/Module/Api/Friendica/Group/Delete.php	patch \|	diff1 \|	diff2 \|	blob \| history
src/Module/Api/Friendica/Group/Update.php	patch \|	diff1 \|	diff2 \|	blob \| history