From: Dessalines <tyhou13@gmx.com>
Date: Sat, 1 Aug 2020 22:05:30 +0000 (-0400)
Subject: Merge branch 'main' into front_end_prettying
X-Git-Url: http://these/git/%24%7B%60data:application/static/gitweb.css?a=commitdiff_plain;h=0fccb22cd748bb2a917529aa18b3ab12903daab8;p=lemmy.git

Merge branch 'main' into front_end_prettying
---

0fccb22cd748bb2a917529aa18b3ab12903daab8