From: Chocobozzz <chocobozzz@framasoft.org>
Date: Thu, 11 Jun 2020 08:36:04 +0000 (+0200)
Subject: Merge branch 'blacklist' into 'develop'
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=fa58a19819cb821a5c5a26802efd492461be9c04;p=oweals%2Fpeertube.git

Merge branch 'blacklist' into 'develop'

rename blacklist to block/blocklist, merge block and auto-block views

See merge request framasoft/peertube/PeerTube!30
---

fa58a19819cb821a5c5a26802efd492461be9c04