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

author Thibaut Girka <thib@sitedethib.com>

Wed, 22 Jul 2020 20:53:46 +0000 (22:53 +0200)

committer Thibaut Girka <thib@sitedethib.com>

Wed, 22 Jul 2020 20:53:46 +0000 (22:53 +0200)
author Thibaut Girka <thib@sitedethib.com>
Wed, 22 Jul 2020 20:53:46 +0000 (22:53 +0200)
committer Thibaut Girka <thib@sitedethib.com>
Wed, 22 Jul 2020 20:53:46 +0000 (22:53 +0200)
diff --cc app/javascript/styles/mastodon/components.scss
Simple merge
author	Thibaut Girka <thib@sitedethib.com>
	Wed, 22 Jul 2020 20:53:46 +0000 (22:53 +0200)
committer	Thibaut Girka <thib@sitedethib.com>
	Wed, 22 Jul 2020 20:53:46 +0000 (22:53 +0200)