Merge branch 'blacklist' into 'develop'
authorChocobozzz <chocobozzz@framasoft.org>
Thu, 11 Jun 2020 08:36:04 +0000 (10:36 +0200)
committerChocobozzz <chocobozzz@framasoft.org>
Thu, 11 Jun 2020 08:36:04 +0000 (10:36 +0200)
commitfa58a19819cb821a5c5a26802efd492461be9c04
tree72bd8307da8ac447bb9934b1301ab0d93ea97e6b
parent50a04125dac1a126cb79a9fb575fcf673c5ac2d6
parente95bede8fe660a38c99e51560caa5dd58a8eb23e
Merge branch 'blacklist' into 'develop'

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

See merge request framasoft/peertube/PeerTube!30