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/images | |
| 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/images')
| -rw-r--r-- | client/src/app/shared/images/global-icon.component.ts | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/client/src/app/shared/images/global-icon.component.ts b/client/src/app/shared/images/global-icon.component.ts index d2700f6c3..169882685 100644 --- a/client/src/app/shared/images/global-icon.component.ts +++ b/client/src/app/shared/images/global-icon.component.ts | |||
| @@ -56,7 +56,8 @@ const icons = { | |||
| 56 | 'refresh': require('!!raw-loader?!../../../assets/images/global/refresh.svg').default, | 56 | 'refresh': require('!!raw-loader?!../../../assets/images/global/refresh.svg').default, |
| 57 | 'npm': require('!!raw-loader?!../../../assets/images/global/npm.svg').default, | 57 | 'npm': require('!!raw-loader?!../../../assets/images/global/npm.svg').default, |
| 58 | 'fullscreen': require('!!raw-loader?!../../../assets/images/global/fullscreen.svg').default, | 58 | 'fullscreen': require('!!raw-loader?!../../../assets/images/global/fullscreen.svg').default, |
| 59 | 'exit-fullscreen': require('!!raw-loader?!../../../assets/images/global/exit-fullscreen.svg').default | 59 | 'exit-fullscreen': require('!!raw-loader?!../../../assets/images/global/exit-fullscreen.svg').default, |
| 60 | 'robot': require('!!raw-loader?!../../../assets/images/global/robot.svg').default | ||
| 60 | } | 61 | } |
| 61 | 62 | ||
| 62 | export type GlobalIconName = keyof typeof icons | 63 | export type GlobalIconName = keyof typeof icons |