From: Dessalines <tyhou13@gmx.com>
Date: Mon, 22 Mar 2021 14:29:10 +0000 (-0400)
Subject: Merge branch 'main' into move_matrix_and_admin_to_person
X-Git-Url: http://these/git/%7B%60%24%7BghostArchiveUrl%7D/static/%24%7BappleTouchIcon%7D?a=commitdiff_plain;h=e4ead96d3adeb9e3a8549825399cf0c0825c1b84;p=lemmy.git

Merge branch 'main' into move_matrix_and_admin_to_person
---

e4ead96d3adeb9e3a8549825399cf0c0825c1b84