From: Dessalines <tyhou13@gmx.com>
Date: Wed, 1 Jul 2020 13:05:25 +0000 (-0400)
Subject: Merge branch 'federation'
X-Git-Url: http://these/git/%7B%60%24%7BwebArchiveUrl%7D/%22%7B%7D/readmes/%22https:/hacktivis.me/%7Brss%7D?a=commitdiff_plain;h=dbeb8d8da4323be1f33c80466453a2708d1b84a3;p=lemmy.git

Merge branch 'federation'
---

dbeb8d8da4323be1f33c80466453a2708d1b84a3