From: Dessalines <tyhou13@gmx.com>
Date: Tue, 18 Aug 2020 13:35:27 +0000 (-0400)
Subject: Merge branch 'fix-federation-enabled-option' into main
X-Git-Url: http://these/git/readmes/%24%7Bk%5B1%5D.custom_emoji.image_url%7D?a=commitdiff_plain;h=53d449d5d708bb47028fcfd928a3552c86d3370b;p=lemmy.git

Merge branch 'fix-federation-enabled-option' into main
---

53d449d5d708bb47028fcfd928a3552c86d3370b