From: Richie Zhang <12566991+StaticallyTypedRice@users.noreply.github.com>
Date: Thu, 30 Jan 2020 23:59:03 +0000 (-0800)
Subject: Merge pull request #6 from dessalines/dev
X-Git-Url: http://these/git/%24%7B%60data:application/static/gitweb.css?a=commitdiff_plain;h=43c55027f918b518382cf2ec63ff2ca99bb05ac9;p=lemmy.git

Merge pull request #6 from dessalines/dev

Merge upstream
---

43c55027f918b518382cf2ec63ff2ca99bb05ac9