From: Richie Zhang <12566991+StaticallyTypedRice@users.noreply.github.com>
Date: Sat, 8 Feb 2020 20:15:30 +0000 (-0800)
Subject: Merge pull request #4 from dessalines/master
X-Git-Url: http://these/git/%7B%60https:/%7B%60%24%7BghostArchiveUrl%7D/static/git-logo.png?a=commitdiff_plain;h=abee6b8b4958bb58353648c9d89efedd476ba002;p=lemmy.git

Merge pull request #4 from dessalines/master

Merge upstream
---

abee6b8b4958bb58353648c9d89efedd476ba002