Merge branch 'master' into stable

diff --git a/2018/includes/generated-sessions.html b/2018/includes/generated-sessions.html
index 4e586215fd70d873440e395f7f73a59c6b40501f..bb0ec2c7b2d3ed804a067c95281b5a5a05ee34b2 100644 (file)
--- a/2018/includes/generated-sessions.html
+++ b/2018/includes/generated-sessions.html
@@ -27,7 +27,7 @@
 <section class="program-session" id="day-1-timeslot-3-session-1">
 <header class="program-session-header">
 <hgroup>
-<h2>Free software forever</h2>
+<h2><h2>Free software forever<span class="label label-default" style="background-color: white; color: black; border: 1px solid black;"><span class="glyphicon glyphicon-facetime-video"></span> <a href="https://media.libreplanet.org/u/libreplanet/m/free-software-forever-with-slides/">WATCH</a></span></h2></h2>
 </hgroup>
 </header>
 <div class="program-session-speaker">