From: Chocobozzz <me@florianbigard.com>
Date: Fri, 30 Jul 2021 09:38:19 +0000 (+0200)
Subject: Merge branch 'release/3.3.0' into develop
X-Git-Tag: v3.4.0-rc.1~162
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=171efc48e67498406feb6d7873b3482b41505515;p=github%2FChocobozzz%2FPeerTube.git

Merge branch 'release/3.3.0' into develop
---

171efc48e67498406feb6d7873b3482b41505515