diff options
| author | Chocobozzz <me@florianbigard.com> | 2019-05-21 11:21:56 +0200 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2019-05-21 11:21:56 +0200 |
| commit | 432ebe8bddb407bfbe503b782d59b1ee4c0d6842 (patch) | |
| tree | b37b83b0edea8655e7fc24326eb520ebb29297fe /client/src/app/+admin | |
| parent | 73b3aa6429dfb2e31628fa09a479dce318289d7d (diff) | |
| parent | b9dde7d96b28a8004a2698f465447f0f9b6b6dbb (diff) | |
| download | PeerTube-432ebe8bddb407bfbe503b782d59b1ee4c0d6842.tar.gz PeerTube-432ebe8bddb407bfbe503b782d59b1ee4c0d6842.tar.zst PeerTube-432ebe8bddb407bfbe503b782d59b1ee4c0d6842.zip | |
Merge branch 'release/v1.3.0' into develop
Diffstat (limited to 'client/src/app/+admin')
| -rw-r--r-- | client/src/app/+admin/moderation/video-auto-blacklist-list/video-auto-blacklist-list.component.html | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/client/src/app/+admin/moderation/video-auto-blacklist-list/video-auto-blacklist-list.component.html b/client/src/app/+admin/moderation/video-auto-blacklist-list/video-auto-blacklist-list.component.html index 62dde60bb..e2193b630 100644 --- a/client/src/app/+admin/moderation/video-auto-blacklist-list/video-auto-blacklist-list.component.html +++ b/client/src/app/+admin/moderation/video-auto-blacklist-list/video-auto-blacklist-list.component.html | |||
| @@ -1,4 +1,5 @@ | |||
| 1 | <my-videos-selection | 1 | <my-videos-selection |
| 2 | [pagination]="pagination" | ||
| 2 | [(selection)]="selection" | 3 | [(selection)]="selection" |
| 3 | [(videosModel)]="videos" | 4 | [(videosModel)]="videos" |
| 4 | [miniatureDisplayOptions]="miniatureDisplayOptions" | 5 | [miniatureDisplayOptions]="miniatureDisplayOptions" |