From: Chocobozzz <me@florianbigard.com>
Date: Wed, 15 Apr 2020 12:16:40 +0000 (+0200)
Subject: Merge branch 'pr/2629' into develop
X-Git-Tag: v2.2.0-rc.1~222
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=62068f4153cb1e67fe30a7f92947c3f2ec058c73;p=oweals%2Fpeertube.git

Merge branch 'pr/2629' into develop
---

62068f4153cb1e67fe30a7f92947c3f2ec058c73