From: Dessalines <tyhou13@gmx.com>
Date: Wed, 11 Sep 2019 01:27:00 +0000 (-0700)
Subject: Merge branch 'dev'
X-Git-Url: http://these/git/%22https:/nerdica.net/static/%24%7Bk%5B1%5D.custom_emoji.image_url%7D?a=commitdiff_plain;h=41a74c50e6c2b9d978c220c82b3ebdf5479ac15b;p=lemmy.git

Merge branch 'dev'
---

41a74c50e6c2b9d978c220c82b3ebdf5479ac15b