aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/app/shared
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2019-01-29 08:42:12 +0100
committerChocobozzz <me@florianbigard.com>2019-01-29 08:42:12 +0100
commitd4520481271087aa284913ff6c198a93c0b37c49 (patch)
tree25e4a2ca64f21d9d047ac7d147f7e781b1cdb80e /client/src/app/shared
parent185a4abd23ba07ee252655574506755c0425c540 (diff)
parent2c0070c8f31e6a28b1d52ee6e9965e21471abd5b (diff)
downloadPeerTube-d4520481271087aa284913ff6c198a93c0b37c49.tar.gz
PeerTube-d4520481271087aa284913ff6c198a93c0b37c49.tar.zst
PeerTube-d4520481271087aa284913ff6c198a93c0b37c49.zip
Merge branch 'develop' into release/v1.2.0
Diffstat (limited to 'client/src/app/shared')
-rw-r--r--client/src/app/shared/icons/global-icon.component.ts1
1 files changed, 1 insertions, 0 deletions
diff --git a/client/src/app/shared/icons/global-icon.component.ts b/client/src/app/shared/icons/global-icon.component.ts
index 5b9377e3e..e8ada0324 100644
--- a/client/src/app/shared/icons/global-icon.component.ts
+++ b/client/src/app/shared/icons/global-icon.component.ts
@@ -19,6 +19,7 @@ const icons = {
19 'delete': require('../../../assets/images/global/delete.html'), 19 'delete': require('../../../assets/images/global/delete.html'),
20 'cross': require('../../../assets/images/global/cross.html'), 20 'cross': require('../../../assets/images/global/cross.html'),
21 'validate': require('../../../assets/images/global/validate.html'), 21 'validate': require('../../../assets/images/global/validate.html'),
22 'tick': require('../../../assets/images/global/tick.html'),
22 'dislike': require('../../../assets/images/video/dislike.html'), 23 'dislike': require('../../../assets/images/video/dislike.html'),
23 'heart': require('../../../assets/images/video/heart.html'), 24 'heart': require('../../../assets/images/video/heart.html'),
24 'like': require('../../../assets/images/video/like.html'), 25 'like': require('../../../assets/images/video/like.html'),