From: Felix Ableitner <me@nutomic.com>
Date: Tue, 7 Apr 2020 15:33:50 +0000 (+0200)
Subject: Merge branch 'federation_add_fed_columns' of https://yerbamate.dev/dessalines/lemmy... 
X-Git-Url: http://these/git/?a=commitdiff_plain;h=095ccae616e40a93d59a14ee9e36840c0816aef4;p=lemmy.git

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

095ccae616e40a93d59a14ee9e36840c0816aef4