From: Chocobozzz <me@florianbigard.com>
Date: Fri, 28 May 2021 12:25:03 +0000 (+0200)
Subject: Merge branch 'release/3.2.0' into develop
X-Git-Tag: v3.3.0-rc.1~189
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=1c5e49e75284100b7b1fc8b4e73c8ba53fe22e89;p=github%2FChocobozzz%2FPeerTube.git

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

1c5e49e75284100b7b1fc8b4e73c8ba53fe22e89