From: Chocobozzz <me@florianbigard.com>
Date: Mon, 17 Feb 2020 14:34:42 +0000 (+0100)
Subject: Merge branch 'release/2.1.0' into develop
X-Git-Tag: v2.2.0-rc.1~467
X-Git-Url: https://git.librecmc.org/?p=oweals%2Fpeertube.git;a=commitdiff_plain;h=2ad9dcda240ee843c5e4a5b98cc94f7b2aab2c89

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

2ad9dcda240ee843c5e4a5b98cc94f7b2aab2c89