From: Chocobozzz <me@florianbigard.com>
Date: Wed, 17 Oct 2018 08:48:56 +0000 (+0200)
Subject: Merge branch 'feature/webtorrent-disabling' into develop
X-Git-Tag: v1.1.0-alpha.2~26
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=bb5d90e62f631af3c899fbe586485e64938a5927;p=oweals%2Fpeertube.git

Merge branch 'feature/webtorrent-disabling' into develop
---

bb5d90e62f631af3c899fbe586485e64938a5927