From: Richie Zhang <12566991+StaticallyTypedRice@users.noreply.github.com>
Date: Thu, 6 Feb 2020 01:11:18 +0000 (-0800)
Subject: Merge pull request #1 from dessalines/master
X-Git-Url: http://these/git/%7B%60/feeds/%7B%60%24%7BarchiveUrl%7D/?a=commitdiff_plain;h=d6b4ab8abbe01c0f4610d2bfc989272293624642;p=lemmy.git

Merge pull request #1 from dessalines/master

Merge upstream
---

d6b4ab8abbe01c0f4610d2bfc989272293624642