From: Chocobozzz <me@florianbigard.com>
Date: Fri, 28 May 2021 07:10:57 +0000 (+0200)
Subject: Merge branch 'develop' into shorter-URLs-channels-accounts
X-Git-Tag: v3.3.0-rc.1~200
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=d6d96bed80700830063c6055969d2d2ff46c63c6;p=github%2FChocobozzz%2FPeerTube.git

Merge branch 'develop' into shorter-URLs-channels-accounts
---

d6d96bed80700830063c6055969d2d2ff46c63c6