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

author Thibaut Girka <thib@sitedethib.com>

Sat, 4 May 2019 17:15:50 +0000 (19:15 +0200)

committer Thibaut Girka <thib@sitedethib.com>

Sat, 4 May 2019 17:15:50 +0000 (19:15 +0200)
author Thibaut Girka <thib@sitedethib.com>
Sat, 4 May 2019 17:15:50 +0000 (19:15 +0200)
committer Thibaut Girka <thib@sitedethib.com>
Sat, 4 May 2019 17:15:50 +0000 (19:15 +0200)
diff --cc app/javascript/styles/mastodon/admin.scss
Simple merge
diff --cc app/javascript/styles/mastodon/components.scss
Simple merge
diff --cc lib/mastodon/version.rb
Simple merge
author	Thibaut Girka <thib@sitedethib.com>
	Sat, 4 May 2019 17:15:50 +0000 (19:15 +0200)
committer	Thibaut Girka <thib@sitedethib.com>
	Sat, 4 May 2019 17:15:50 +0000 (19:15 +0200)
		1	2
app/javascript/styles/mastodon/admin.scss	patch \|	diff1 \|	diff2 \|	blob \| history
app/javascript/styles/mastodon/components.scss	patch \|	diff1 \|	diff2 \|	blob \| history
lib/mastodon/version.rb	patch \|	diff1 \|	diff2 \|	blob \| history