diff options
| author | Chocobozzz <chocobozzz@framasoft.org> | 2020-06-11 10:36:04 +0200 |
|---|---|---|
| committer | Chocobozzz <chocobozzz@framasoft.org> | 2020-06-11 10:36:04 +0200 |
| commit | fa58a19819cb821a5c5a26802efd492461be9c04 (patch) | |
| tree | 72bd8307da8ac447bb9934b1301ab0d93ea97e6b /shared/models | |
| parent | 50a04125dac1a126cb79a9fb575fcf673c5ac2d6 (diff) | |
| parent | e95bede8fe660a38c99e51560caa5dd58a8eb23e (diff) | |
| download | PeerTube-fa58a19819cb821a5c5a26802efd492461be9c04.tar.gz PeerTube-fa58a19819cb821a5c5a26802efd492461be9c04.tar.zst PeerTube-fa58a19819cb821a5c5a26802efd492461be9c04.zip | |
Merge branch 'blacklist' into 'develop'
rename blacklist to block/blocklist, merge block and auto-block views
See merge request framasoft/peertube/PeerTube!30
Diffstat (limited to 'shared/models')
| -rw-r--r-- | shared/models/users/user-flag.model.ts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/shared/models/users/user-flag.model.ts b/shared/models/users/user-flag.model.ts index f5759f18f..b94262d5e 100644 --- a/shared/models/users/user-flag.model.ts +++ b/shared/models/users/user-flag.model.ts | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | export enum UserAdminFlag { | 1 | export enum UserAdminFlag { |
| 2 | NONE = 0, | 2 | NONE = 0, |
| 3 | BY_PASS_VIDEO_AUTO_BLACKLIST = 1 << 0 | 3 | BYPASS_VIDEO_AUTO_BLACKLIST = 1 << 0 |
| 4 | } | 4 | } |