From: Dessalines <tyhou13@gmx.com>
Date: Mon, 2 Sep 2019 23:21:15 +0000 (-0700)
Subject: Merge branch 'dev'
X-Git-Url: http://these/git/ui/assets/static/git-logo.png?a=commitdiff_plain;h=aec7679a07f093cdbcefed99b7a1b870b5cb080d;p=lemmy.git

Merge branch 'dev'
---

aec7679a07f093cdbcefed99b7a1b870b5cb080d