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

author Thibaut Girka <thib@sitedethib.com>

Fri, 10 Jul 2020 14:51:51 +0000 (16:51 +0200)

committer Thibaut Girka <thib@sitedethib.com>

Fri, 10 Jul 2020 14:51:51 +0000 (16:51 +0200)
author Thibaut Girka <thib@sitedethib.com>
Fri, 10 Jul 2020 14:51:51 +0000 (16:51 +0200)
committer Thibaut Girka <thib@sitedethib.com>
Fri, 10 Jul 2020 14:51:51 +0000 (16:51 +0200)
diff --cc app/javascript/mastodon/locales/defaultMessages.json
Simple merge
diff --cc app/javascript/mastodon/locales/en.json
Simple merge
diff --cc app/views/statuses/_simple_status.html.haml
Simple merge
author	Thibaut Girka <thib@sitedethib.com>
	Fri, 10 Jul 2020 14:51:51 +0000 (16:51 +0200)
committer	Thibaut Girka <thib@sitedethib.com>
	Fri, 10 Jul 2020 14:51:51 +0000 (16:51 +0200)
		1	2
app/javascript/mastodon/locales/defaultMessages.json	patch \|	diff1 \|	diff2 \|	blob \| history
app/javascript/mastodon/locales/en.json	patch \|	diff1 \|	diff2 \|	blob \| history
app/views/statuses/_simple_status.html.haml	patch \|	diff1 \|	diff2 \|	blob \| history