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 /client/src/app/shared/index.ts | |
| 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 'client/src/app/shared/index.ts')
| -rw-r--r-- | client/src/app/shared/index.ts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/client/src/app/shared/index.ts b/client/src/app/shared/index.ts index 136730c91..8be578d9f 100644 --- a/client/src/app/shared/index.ts +++ b/client/src/app/shared/index.ts | |||
| @@ -3,5 +3,5 @@ export * from './forms' | |||
| 3 | export * from './rest' | 3 | export * from './rest' |
| 4 | export * from './users' | 4 | export * from './users' |
| 5 | export * from './video-abuse' | 5 | export * from './video-abuse' |
| 6 | export * from './video-blacklist' | 6 | export * from './video-block' |
| 7 | export * from './shared.module' | 7 | export * from './shared.module' |