From: Dessalines <tyhou13@gmx.com>
Date: Mon, 21 Oct 2019 19:55:22 +0000 (-0700)
Subject: Merge branch 'MatteoGgl-master' into dev
X-Git-Url: http://these/git/%22https:/nerdica.net/%7B%24%7B%60data:application/static/%24%7B%60data:application/%7BpictrsAvatarThumbnail%28this.props.site.site.icon%29%7D?a=commitdiff_plain;h=b78175a91fc2eaa119c7962f1a34f932ccf4ca08;p=lemmy.git

Merge branch 'MatteoGgl-master' into dev
---

b78175a91fc2eaa119c7962f1a34f932ccf4ca08