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

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

Wed, 12 May 2021 09:03:05 +0000 (11:03 +0200)

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

Wed, 12 May 2021 09:03:05 +0000 (11:03 +0200)
author Claire <claire.github-309c@sitedethib.com>
Wed, 12 May 2021 09:03:05 +0000 (11:03 +0200)
committer Claire <claire.github-309c@sitedethib.com>
Wed, 12 May 2021 09:03:05 +0000 (11:03 +0200)
diff --cc app/javascript/styles/mastodon/components.scss
Simple merge
diff --cc app/lib/activitypub/activity/create.rb
Simple merge
diff --cc lib/mastodon/version.rb
Simple merge
author	Claire <claire.github-309c@sitedethib.com>
	Wed, 12 May 2021 09:03:05 +0000 (11:03 +0200)
committer	Claire <claire.github-309c@sitedethib.com>
	Wed, 12 May 2021 09:03:05 +0000 (11:03 +0200)
		1	2
app/javascript/styles/mastodon/components.scss	patch \|	diff1 \|	diff2 \|	blob \| history
app/lib/activitypub/activity/create.rb	patch \|	diff1 \|	diff2 \|	blob \| history
lib/mastodon/version.rb	patch \|	diff1 \|	diff2 \|	blob \| history