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

author Thibaut Girka <thib@sitedethib.com>

Sun, 2 Aug 2020 20:29:17 +0000 (22:29 +0200)

committer Thibaut Girka <thib@sitedethib.com>

Sun, 2 Aug 2020 20:29:17 +0000 (22:29 +0200)
author Thibaut Girka <thib@sitedethib.com>
Sun, 2 Aug 2020 20:29:17 +0000 (22:29 +0200)
committer Thibaut Girka <thib@sitedethib.com>
Sun, 2 Aug 2020 20:29:17 +0000 (22:29 +0200)
diff --cc app/views/statuses/_simple_status.html.haml
Simple merge
author	Thibaut Girka <thib@sitedethib.com>
	Sun, 2 Aug 2020 20:29:17 +0000 (22:29 +0200)
committer	Thibaut Girka <thib@sitedethib.com>
	Sun, 2 Aug 2020 20:29:17 +0000 (22:29 +0200)