From: Chocobozzz <me@florianbigard.com>
Date: Wed, 6 Feb 2019 12:41:17 +0000 (+0100)
Subject: Merge branch 'release/v1.2.0' into develop
X-Git-Tag: v1.3.0-rc.1~205^2~2^2~19
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=552dd3306fe867d8be30508ef9f30a1738241082;p=oweals%2Fpeertube.git

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

552dd3306fe867d8be30508ef9f30a1738241082