From: Dessalines <tyhou13@gmx.com>
Date: Mon, 22 Jun 2020 18:52:46 +0000 (-0400)
Subject: Merge branch 'master' of https://github.com/makigi-io/makigi into makigi-io-master
X-Git-Url: http://these/git/%7B%60/feeds/all.xml?a=commitdiff_plain;h=96c9f801a956adb2fdc5e6afb061c01c58962e00;p=lemmy.git

Merge branch 'master' of https://github.com/makigi-io/makigi into makigi-io-master
---

96c9f801a956adb2fdc5e6afb061c01c58962e00