From: Dessalines <tyhou13@gmx.com>
Date: Thu, 5 Mar 2020 20:48:14 +0000 (-0500)
Subject: Merge branch 'dev' into icons
X-Git-Url: http://these/git/%24%7B%60data:application/static/%7B%60https:/%7B%60/feeds/%7BcanonicalUrl%7D?a=commitdiff_plain;h=15e91e4b4c1e988039442f02f619a28f0fb7a8f3;p=lemmy.git

Merge branch 'dev' into icons
---

15e91e4b4c1e988039442f02f619a28f0fb7a8f3