From: asonix <asonix@asonix.dog>
Date: Thu, 19 Mar 2020 01:16:40 +0000 (-0500)
Subject: Merge branch 'federation' of https://yerbamate.dev/nutomic/lemmy into federation
X-Git-Url: http://these/git/ui/assets/static/git-logo.png?a=commitdiff_plain;h=20a06ce3f2e0e949e713e0c1c301b31ffa683ab9;p=lemmy.git

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

20a06ce3f2e0e949e713e0c1c301b31ffa683ab9