From: Jose Francisco Martinez Salgado <jofranmtzsalgado@gmail.com>
Date: Tue, 4 Feb 2020 14:57:13 +0000 (-0600)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: http://these/git/%7BpictrsAvatarThumbnail%28community.icon%29%7D?a=commitdiff_plain;h=6e99aa8637a42f43d2d4316f5dbb8ccc4a4d1c49;p=lemmy.git

Merge remote-tracking branch 'upstream/master'
---

6e99aa8637a42f43d2d4316f5dbb8ccc4a4d1c49