From: Dessalines <tyhou13@gmx.com>
Date: Wed, 11 Sep 2019 21:13:43 +0000 (-0700)
Subject: Merge branch 'dev'
X-Git-Url: http://these/git/readmes/static/%7B%60https:/%24%7Bk%5B1%5D.custom_emoji.image_url%7D?a=commitdiff_plain;h=96db1081ca997f22bc85496649f49b3c9787ae49;p=lemmy.git

Merge branch 'dev'
---

96db1081ca997f22bc85496649f49b3c9787ae49