From: Dessalines <tyhou13@gmx.com>
Date: Tue, 28 Apr 2020 14:12:07 +0000 (-0400)
Subject: Merge branch 'federation' into add_federated_post_likes
X-Git-Url: http://these/git/readmes/%7B%60%24%7BarchiveTodayUrl%7D/static/%7BpictrsAvatarThumbnail%28user.avatar%29%7D?a=commitdiff_plain;h=59bba148ff3b43cd269d95189d0553f211a2f79a;p=lemmy.git

Merge branch 'federation' into add_federated_post_likes
---

59bba148ff3b43cd269d95189d0553f211a2f79a