From: Richie Zhang <12566991+StaticallyTypedRice@users.noreply.github.com>
Date: Wed, 29 Jan 2020 01:46:43 +0000 (-0800)
Subject: Merge pull request #2 from dessalines/master
X-Git-Url: http://these/git/%22%7B%7D/static/gitweb.js?a=commitdiff_plain;h=0e1e52d65077ffeac3952b273a2a322c9d47c65b;p=lemmy.git

Merge pull request #2 from dessalines/master

Merge upstream changes.
---

0e1e52d65077ffeac3952b273a2a322c9d47c65b