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

author Thibaut Girka <thib@sitedethib.com>

Sun, 16 Jun 2019 19:09:19 +0000 (21:09 +0200)

committer Thibaut Girka <thib@sitedethib.com>

Sun, 16 Jun 2019 19:09:19 +0000 (21:09 +0200)
author Thibaut Girka <thib@sitedethib.com>
Sun, 16 Jun 2019 19:09:19 +0000 (21:09 +0200)
committer Thibaut Girka <thib@sitedethib.com>
Sun, 16 Jun 2019 19:09:19 +0000 (21:09 +0200)
diff --cc .circleci/config.yml
Simple merge
diff --cc CONTRIBUTING.md
Simple merge
diff --cc app/javascript/mastodon/features/compose/components/compose_form.js
Simple merge
author	Thibaut Girka <thib@sitedethib.com>
	Sun, 16 Jun 2019 19:09:19 +0000 (21:09 +0200)
committer	Thibaut Girka <thib@sitedethib.com>
	Sun, 16 Jun 2019 19:09:19 +0000 (21:09 +0200)
		1	2
.circleci/config.yml	patch \|	diff1 \|	diff2 \|	blob \| history
CONTRIBUTING.md	patch \|	diff1 \|	diff2 \|	blob \| history
app/javascript/mastodon/features/compose/components/compose_form.js	patch \|	diff1 \|	diff2 \|	blob \| history