From: Dessalines <tyhou13@gmx.com>
Date: Wed, 22 Apr 2020 00:41:50 +0000 (-0400)
Subject: Merge branch 'federation' of https://yerbamate.dev/LemmyNet/lemmy into federation
X-Git-Url: http://these/git/?a=commitdiff_plain;h=92e30311ce6ca2266f7174dac8d07fca11060230;p=lemmy.git

Merge branch 'federation' of https://yerbamate.dev/LemmyNet/lemmy into federation
---

92e30311ce6ca2266f7174dac8d07fca11060230