Merge branch 'main' into glitch-soc/merge-upstream

author Claire <claire.github-309c@sitedethib.com>

Mon, 14 Mar 2022 15:44:35 +0000 (16:44 +0100)

committer Claire <claire.github-309c@sitedethib.com>

Mon, 14 Mar 2022 15:44:35 +0000 (16:44 +0100)
author Claire <claire.github-309c@sitedethib.com>
Mon, 14 Mar 2022 15:44:35 +0000 (16:44 +0100)
committer Claire <claire.github-309c@sitedethib.com>
Mon, 14 Mar 2022 15:44:35 +0000 (16:44 +0100)
diff --cc app/javascript/mastodon/locales/defaultMessages.json
Simple merge
diff --cc app/javascript/mastodon/locales/en.json
Simple merge
diff --cc app/views/admin/instances/show.html.haml
Simple merge
author	Claire <claire.github-309c@sitedethib.com>
	Mon, 14 Mar 2022 15:44:35 +0000 (16:44 +0100)
committer	Claire <claire.github-309c@sitedethib.com>
	Mon, 14 Mar 2022 15:44:35 +0000 (16:44 +0100)
		1	2
app/javascript/mastodon/locales/defaultMessages.json	patch \|	diff1 \|	diff2 \|	blob \| history
app/javascript/mastodon/locales/en.json	patch \|	diff1 \|	diff2 \|	blob \| history
app/views/admin/instances/show.html.haml	patch \|	diff1 \|	diff2 \|	blob \| history