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

author Thibaut Girka <thib@sitedethib.com>

Mon, 10 Jun 2019 18:09:05 +0000 (20:09 +0200)

committer Thibaut Girka <thib@sitedethib.com>

Mon, 10 Jun 2019 18:09:05 +0000 (20:09 +0200)
author Thibaut Girka <thib@sitedethib.com>
Mon, 10 Jun 2019 18:09:05 +0000 (20:09 +0200)
committer Thibaut Girka <thib@sitedethib.com>
Mon, 10 Jun 2019 18:09:05 +0000 (20:09 +0200)
diff --cc app/views/settings/preferences/other/show.html.haml
Simple merge
author	Thibaut Girka <thib@sitedethib.com>
	Mon, 10 Jun 2019 18:09:05 +0000 (20:09 +0200)
committer	Thibaut Girka <thib@sitedethib.com>
	Mon, 10 Jun 2019 18:09:05 +0000 (20:09 +0200)