From: Dessalines <tyhou13@gmx.com>
Date: Fri, 17 Jan 2020 18:29:46 +0000 (-0500)
Subject: Merge branch 'dev'
X-Git-Url: http://these/git/%7B%60%24%7BghostArchiveUrl%7D/static/%7B%60%24%7BwebArchiveUrl%7D/save/%7B%60https:/%24%7Bsubmission.url%7D?a=commitdiff_plain;h=0c21b65917ada975b7abbaa4020797a789e1dd96;p=lemmy.git

Merge branch 'dev'
---

0c21b65917ada975b7abbaa4020797a789e1dd96