Merge remote-tracking branch 'upstream/2023.03-rc' into api-edit

author Michael <heluecht@pirati.ca>

Tue, 14 Mar 2023 21:46:24 +0000 (21:46 +0000)

committer Michael <heluecht@pirati.ca>

Tue, 14 Mar 2023 21:46:24 +0000 (21:46 +0000)
author Michael <heluecht@pirati.ca>
Tue, 14 Mar 2023 21:46:24 +0000 (21:46 +0000)
committer Michael <heluecht@pirati.ca>
Tue, 14 Mar 2023 21:46:24 +0000 (21:46 +0000)
diff --cc src/Model/Post/Media.php
Simple merge
diff --cc src/Module/Api/Mastodon/Statuses.php
Simple merge
author	Michael <heluecht@pirati.ca>
	Tue, 14 Mar 2023 21:46:24 +0000 (21:46 +0000)
committer	Michael <heluecht@pirati.ca>
	Tue, 14 Mar 2023 21:46:24 +0000 (21:46 +0000)
		1	2
src/Model/Post/Media.php	patch \|	diff1 \|	diff2 \|	blob \| history
src/Module/Api/Mastodon/Statuses.php	patch \|	diff1 \|	diff2 \|	blob \| history