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

author Thibaut Girka <thib@sitedethib.com>

Fri, 28 Jun 2019 10:11:45 +0000 (12:11 +0200)

committer Thibaut Girka <thib@sitedethib.com>

Fri, 28 Jun 2019 10:11:45 +0000 (12:11 +0200)
author Thibaut Girka <thib@sitedethib.com>
Fri, 28 Jun 2019 10:11:45 +0000 (12:11 +0200)
committer Thibaut Girka <thib@sitedethib.com>
Fri, 28 Jun 2019 10:11:45 +0000 (12:11 +0200)
diff --cc app/javascript/styles/mastodon/components.scss
Simple merge
author	Thibaut Girka <thib@sitedethib.com>
	Fri, 28 Jun 2019 10:11:45 +0000 (12:11 +0200)
committer	Thibaut Girka <thib@sitedethib.com>
	Fri, 28 Jun 2019 10:11:45 +0000 (12:11 +0200)