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

author Thibaut Girka <thib@sitedethib.com>

Sun, 1 Dec 2019 11:12:42 +0000 (12:12 +0100)

committer Thibaut Girka <thib@sitedethib.com>

Sun, 1 Dec 2019 11:12:42 +0000 (12:12 +0100)
author Thibaut Girka <thib@sitedethib.com>
Sun, 1 Dec 2019 11:12:42 +0000 (12:12 +0100)
committer Thibaut Girka <thib@sitedethib.com>
Sun, 1 Dec 2019 11:12:42 +0000 (12:12 +0100)
diff --cc .env.production.sample
Simple merge
diff --cc app/javascript/styles/mastodon/components.scss
Simple merge
diff --cc app/views/relationships/show.html.haml
Simple merge
diff --cc config/locales/en.yml
Simple merge
author	Thibaut Girka <thib@sitedethib.com>
	Sun, 1 Dec 2019 11:12:42 +0000 (12:12 +0100)
committer	Thibaut Girka <thib@sitedethib.com>
	Sun, 1 Dec 2019 11:12:42 +0000 (12:12 +0100)
		1	2
.env.production.sample	patch \|	diff1 \|	diff2 \|	blob \| history
app/javascript/styles/mastodon/components.scss	patch \|	diff1 \|	diff2 \|	blob \| history
app/views/relationships/show.html.haml	patch \|	diff1 \|	diff2 \|	blob \| history
config/locales/en.yml	patch \|	diff1 \|	diff2 \|	blob \| history