From: Dessalines <tyhou13@gmx.com>
Date: Sat, 11 Jul 2020 23:12:56 +0000 (-0400)
Subject: Merge branch 'master' into jmarthernandez-remove-karma-from-search
X-Git-Url: http://these/git/ui/assets/static/%7Bvideo_url%7D?a=commitdiff_plain;h=60288b2d060ba930fe6cae22c4824d88fe7a00c9;p=lemmy.git

Merge branch 'master' into jmarthernandez-remove-karma-from-search
---

60288b2d060ba930fe6cae22c4824d88fe7a00c9