From: Chocobozzz <me@florianbigard.com>
Date: Wed, 29 Jan 2020 13:42:02 +0000 (+0100)
Subject: Merge branch 'release/2.1.0' into develop
X-Git-Tag: v2.2.0-rc.1~574
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d5692d4088cdd9fde3be6ff34be8ce2816dab0cf;p=oweals%2Fpeertube.git

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

d5692d4088cdd9fde3be6ff34be8ce2816dab0cf