aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorng0 <ng0@n0.is>2019-07-24 16:55:10 +0000
committerng0 <ng0@n0.is>2019-07-24 16:55:10 +0000
commit97f39a478c5a7f5573e543eaf50921364b193eef (patch)
tree096d01da14e9960ba6ed1a310397a336a7cf402c
parent584d32becbcbbc5426a5300ee2bf2096b2b6abf7 (diff)
parent374c232784ed06b5fe366012a37f99093bfb5054 (diff)
downloadwww-97f39a478c5a7f5573e543eaf50921364b193eef.tar.gz
www-97f39a478c5a7f5573e543eaf50921364b193eef.zip
Merge branch 'master' of gnunet.org:www
-rw-r--r--template/video.html.j28
1 files changed, 4 insertions, 4 deletions
diff --git a/template/video.html.j2 b/template/video.html.j2
index 373cfa9c..7ff610e2 100644
--- a/template/video.html.j2
+++ b/template/video.html.j2
@@ -31,7 +31,7 @@
31 <div class="row container"> 31 <div class="row container">
32 <div class="col-md-5 col-12"> 32 <div class="col-md-5 col-12">
33 <video width="100%" height="100%" controls> 33 <video width="100%" height="100%" controls>
34 <source src="https://git.gnunet.org/gnunet-videos-2019.git/plain/IETF104/GNU_Name_System_-_2019_Edition_IETF104__Christian_Grothoff.mkv" type="video/mp4"> 34 <source src="https://git.gnunet.org/gnunet-videos-2019.git/plain/IETF104/GNU_Name_System_-_2019_Edition_IETF104__Christian_Grothoff.mkv" type="video/x-matroska">
35 Your browser does not support the video tag. 35 Your browser does not support the video tag.
36 </video> 36 </video>
37 </div> 37 </div>
@@ -44,7 +44,7 @@
44 <div class="row container"> 44 <div class="row container">
45 <div class="col-md-5 col-12"> 45 <div class="col-md-5 col-12">
46 <video width="100%" height="100%" controls> 46 <video width="100%" height="100%" controls>
47 <source src="https://git.gnunet.org/gnunet-videos-2018.git/plain/Datenspuren2018/DS2018-9337-deu-State_of_the_GNUnet_webm-hd.webm"> 47 <source src="https://git.gnunet.org/gnunet-videos-2018.git/plain/Datenspuren2018/DS2018-9337-deu-State_of_the_GNUnet_webm-hd.webm" type="video/webm">
48 Your browser does not support the video tag. 48 Your browser does not support the video tag.
49 </video> 49 </video>
50 </div> 50 </div>
@@ -107,7 +107,7 @@
107 </video> 107 </video>
108 </div> 108 </div>
109 <div class="col"> 109 <div class="col">
110 lynX, Scalable and privacy-respectful distributed systems - Our chance to avoid cloud computing, 34C3 110 lynX, Scalable and privacy-respectful distributed systems - Our chance to avoid cloud computing, 34C3
111 </div> 111 </div>
112 </div> 112 </div>
113 <div class="row container"> 113 <div class="row container">
@@ -172,7 +172,7 @@
172 </video> 172 </video>
173 </div> 173 </div>
174 <div class="col"> 174 <div class="col">
175 Christian Grothoff, The Architecture of the GNUnet: 45 Subsystems in 45 Minutes 175 Christian Grothoff, The Architecture of the GNUnet: 45 Subsystems in 45 Minutes
176 </div> 176 </div>
177 </div> 177 </div>
178 <div class="row container"> 178 <div class="row container">