From: Chocobozzz <me@florianbigard.com>
Date: Thu, 22 Aug 2019 15:16:48 +0000 (+0200)
Subject: Merge branch 'release/1.4.0' into develop
X-Git-Tag: v2.0.0-rc.1~114
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=001ed2d40c8d2c8f494f5dc7f91ed62d56df10fd;p=oweals%2Fpeertube.git

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

001ed2d40c8d2c8f494f5dc7f91ed62d56df10fd