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/%7B%60%24%7BwebArchiveUrl%7D/%22%7B%7D/%24%7B%60data:application/%22https:/hacktivis.me/%7BpictrsAvatarThumbnail%28this.props.site.site.icon%29%7D?a=commitdiff_plain;h=43c55027f918b518382cf2ec63ff2ca99bb05ac9;p=lemmy.git

Merge pull request #6 from dessalines/dev

Merge upstream
---

43c55027f918b518382cf2ec63ff2ca99bb05ac9