From: Richie Zhang <12566991+StaticallyTypedRice@users.noreply.github.com>
Date: Sat, 8 Feb 2020 20:17:02 +0000 (-0800)
Subject: Merge pull request #5 from StaticallyTypedRice/master
X-Git-Url: http://these/git/%7B%60/feeds/%7BdonateLemmyUrl%7D?a=commitdiff_plain;h=633568da03440f80a6b938f87b456214d04af759;p=lemmy.git

Merge pull request #5 from StaticallyTypedRice/master

Merge upstream
---

633568da03440f80a6b938f87b456214d04af759