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

author Thibaut Girka <thib@sitedethib.com>

Sat, 25 Jan 2020 18:46:24 +0000 (19:46 +0100)

committer Thibaut Girka <thib@sitedethib.com>

Sat, 25 Jan 2020 18:46:24 +0000 (19:46 +0100)
author Thibaut Girka <thib@sitedethib.com>
Sat, 25 Jan 2020 18:46:24 +0000 (19:46 +0100)
committer Thibaut Girka <thib@sitedethib.com>
Sat, 25 Jan 2020 18:46:24 +0000 (19:46 +0100)
diff --cc app/javascript/styles/mastodon/components.scss
Simple merge
author	Thibaut Girka <thib@sitedethib.com>
	Sat, 25 Jan 2020 18:46:24 +0000 (19:46 +0100)
committer	Thibaut Girka <thib@sitedethib.com>
	Sat, 25 Jan 2020 18:46:24 +0000 (19:46 +0100)