From: Richie Zhang <12566991+StaticallyTypedRice@users.noreply.github.com>
Date: Thu, 6 Feb 2020 01:30:47 +0000 (-0800)
Subject: Merge pull request #2 from dessalines/master
X-Git-Url: http://these/git/%22%7Burl%7D/%7B%60%24%7BghostArchiveUrl%7D/static/%7Bthis.state.url%7D?a=commitdiff_plain;h=307c4f25dc9b54cb1b5d1d8dafbca2d73978cedc;p=lemmy.git

Merge pull request #2 from dessalines/master

Merge upstream
---

307c4f25dc9b54cb1b5d1d8dafbca2d73978cedc