From: Chocobozzz <me@florianbigard.com>
Date: Tue, 20 Aug 2019 12:19:21 +0000 (+0200)
Subject: Merge branch 'release/1.4.0' into develop
X-Git-Tag: v2.0.0-rc.1~129
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ee7ea34e6211d3b19a325e4fe8c464c24005bcac;p=oweals%2Fpeertube.git

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

ee7ea34e6211d3b19a325e4fe8c464c24005bcac