aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/app/+videos
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2021-07-26 15:18:46 +0200
committerChocobozzz <me@florianbigard.com>2021-07-26 15:18:46 +0200
commitac27887774e63d99f4e227fbe18846f143cc4b3c (patch)
tree697a9132412d57809ce63271714b7051a9cc525a /client/src/app/+videos
parent15a7eafb892441957ba7dd6fcbf556086fe5b2b3 (diff)
parent84c6eadc33484358dd962056609df16e8eb1c3d0 (diff)
downloadPeerTube-ac27887774e63d99f4e227fbe18846f143cc4b3c.tar.gz
PeerTube-ac27887774e63d99f4e227fbe18846f143cc4b3c.tar.zst
PeerTube-ac27887774e63d99f4e227fbe18846f143cc4b3c.zip
Merge branch 'release/3.3.0' into develop
Diffstat (limited to 'client/src/app/+videos')
-rw-r--r--client/src/app/+videos/+video-watch/video-watch.component.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/client/src/app/+videos/+video-watch/video-watch.component.html b/client/src/app/+videos/+video-watch/video-watch.component.html
index 0d6103b3b..45cfba167 100644
--- a/client/src/app/+videos/+video-watch/video-watch.component.html
+++ b/client/src/app/+videos/+video-watch/video-watch.component.html
@@ -86,7 +86,7 @@
86 86
87 </div> 87 </div>
88 88
89 <my-video-description [video]="video"></my-video-description> 89 <my-video-description [video]="video" (timestampClicked)="handleTimestampClicked($event)"></my-video-description>
90 90
91 <my-video-attributes [video]="video"></my-video-attributes> 91 <my-video-attributes [video]="video"></my-video-attributes>
92 92