From: Chocobozzz <florian.bigard@gmail.com>
Date: Fri, 7 Oct 2016 08:10:00 +0000 (+0200)
Subject: Merge branch 'webseed'
X-Git-Tag: v0.0.1-alpha~697
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=aff36eb063573532498979c83be1c279c84f2d53;p=github%2FChocobozzz%2FPeerTube.git

Merge branch 'webseed'
---

aff36eb063573532498979c83be1c279c84f2d53