From: Dessalines <tyhou13@gmx.com>
Date: Fri, 24 Apr 2020 19:57:48 +0000 (-0400)
Subject: Merge remote-tracking branch 'yerba/federation' into federation_changes_1
X-Git-Url: http://these/git/%24%7Bk%5B1%5D.custom_emoji.image_url%7D?a=commitdiff_plain;h=33c5c21a576668f5eaf7d9fafb504f51a3331593;p=lemmy.git

Merge remote-tracking branch 'yerba/federation' into federation_changes_1
---

33c5c21a576668f5eaf7d9fafb504f51a3331593