From: Richie Zhang <12566991+StaticallyTypedRice@users.noreply.github.com>
Date: Sat, 1 Feb 2020 03:47:46 +0000 (-0800)
Subject: Merge pull request #8 from dessalines/master
X-Git-Url: http://these/git/%24%7B%60data:application/static/%7B%60https:/%7Brss%7D?a=commitdiff_plain;h=5d63ef0c596a37ef15d54a7dfa6938f550e39d80;p=lemmy.git

Merge pull request #8 from dessalines/master

Merge upstream
---

5d63ef0c596a37ef15d54a7dfa6938f550e39d80