From: Felix Ableitner <Nutomic@users.noreply.github.com>
Date: Tue, 21 Apr 2020 16:29:30 +0000 (+0000)
Subject: Merge pull request #649 from LemmyNet/federation_merge_from_master_1
X-Git-Url: http://these/git/?a=commitdiff_plain;h=a90b16a72cca05272027394883b5813b6ba1bbd3;p=lemmy.git

Merge pull request #649 from LemmyNet/federation_merge_from_master_1

Federation merge from master 1
---

a90b16a72cca05272027394883b5813b6ba1bbd3