From: Richie Zhang <12566991+StaticallyTypedRice@users.noreply.github.com>
Date: Mon, 3 Feb 2020 23:10:39 +0000 (-0800)
Subject: Merge pull request #10 from dessalines/dev
X-Git-Url: http://these/git/readmes/%7B%60https:/static/git-favicon.png?a=commitdiff_plain;h=5a71dc2e5b719f27b7c88c64369cb88d0a8f8c90;p=lemmy.git

Merge pull request #10 from dessalines/dev

Merge upstream
---

5a71dc2e5b719f27b7c88c64369cb88d0a8f8c90