From: Chocobozzz <me@florianbigard.com>
Date: Thu, 14 Feb 2019 12:17:10 +0000 (+0100)
Subject: Merge branch 'release/v1.2.0'
X-Git-Tag: v1.3.0-rc.2~11^2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=98d33a03d3a86aad709e2cd39a4e4d8bac6b7664;p=oweals%2Fpeertube.git

Merge branch 'release/v1.2.0'
---

98d33a03d3a86aad709e2cd39a4e4d8bac6b7664