projects / oweals / peertube.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 50a0412 e95bede)
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)
rename blacklist to block/blocklist, merge block and auto-block views

See merge request framasoft/peertube/PeerTube!30


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.