Merge branch 'master' of vcs.fsf.org:libreplanet-static

diff --combined 2019/includes/generated-sessions.html
index 96cd02abdbd127d67eeedf9b1086ddb55c863f65,5259de93b5854baf8092ce89bf5239a4815393bf..a8c45e1039e4a9d4ed5be531c49cea63d48cacc7
--- 1/2019/includes/generated-sessions.html
--- 2/2019/includes/generated-sessions.html
+++ b/2019/includes/generated-sessions.html
@@@ -742,7 -742,7 +742,7 @@@ were not a concern.</p
  <article class="program-timeslot" id="day-1-timeslot-16">
  <header class="program-timeslot-header">
  <hgroup>
- <h2>17:15 - 18:30: Free Software Awards, with Richard Stallman</h2>
+ <h2>17:15 - 18:00: Free Software Awards, with Richard Stallman</h2>
  </hgroup>
  </header>
  <section class="program-session" id="day-1-timeslot-16-session-1">
@@@ -770,6 -770,34 +770,34 @@@
  </div>
  </section> <!-- day-1-timeslot-16-session-1 end -->
  </article> <!-- day-1-timeslot-16 end -->
+ <article class="program-timeslot" id="day-1-timeslot-17">
+ <header class="program-timeslot-header">
+ <hgroup>
+ <h2>18:00 - 18:15 - Closing</h2>
+ </hgroup>
+ </header>
+ <section class="program-session" id="day-1-timeslot-17-session-1">
+ <div class="program-session-speaker">
+           Room 32-123
+     </div>
+ <div class="program-session-shelf">
+ <div class="program-session-room-details">
+ <span class="room label label-default">videotba</span>
+ </div>
+ <a class="btn btn-default btn-xs" href="Thank you for coming to LibrePlanet 2019!">
+ <span class="glyphicon glyphicon-facetime-video"></span>
+ </a>
+ <button aria-controls="day-1-timeslot-17-session-1-collapse" aria-expanded="false" class="btn btn-default btn-xs" data-target="#day-1-timeslot-17-session-1-collapse" data-toggle="collapse">
+             Show details
+             <span aria-hidden="true" class="glyphicon glyphicon-menu-down"></span>
+ </button>
+ </div>
+ <div class="program-session-desc-block">
+ <div class="session-desc collapse in" id="day-1-timeslot-17-session-1-collapse">
+ </div> <!--  day-1-timeslot-17-session-1-collapse end -->
+ </div>
+ </section> <!-- day-1-timeslot-17-session-1 end -->
+ </article> <!-- day-1-timeslot-17 end -->
  </article> <!-- day-1 end -->
  <article class="program-day" id="day-2-program">
  <header class="program-day-header">
@@@ -968,7 -996,6 +996,6 @@@ of their own.</p
  </hgroup>
  </header>
  <div class="program-session-speaker">
- <a href="https://libreplanet.org/2019/speakers#gordon-byrne">Ms. Gay Gordon-Byrne</a>,
            <a href="https://libreplanet.org/2019/speakers#proctor">Nathan Proctor</a>
  </div>
  <div class="program-session-shelf">
@@@ -1058,7 -1085,7 +1085,7 @@@ guidelines or codes of conduct.</p
  <article class="program-timeslot" id="day-2-timeslot-7">
  <header class="program-timeslot-header">
  <hgroup>
 -<h2>12:35 - 13:35: Lunch</h2>
 +<h2>12:35 - 13:35: Lunch and <a href="https://libreplanet.org/wiki/LibrePlanet:Conference/2019/sunday_members_lunch">Associate members' meeting</a></h2>
  </hgroup>
  </header>
  </article> <!-- day-2-timeslot-7 end -->

diff --combined 2019/program/grid-schedule.html
index 89ba354d15b66e1e59821fc338176cd40b4766bd,8223618b66ce92703361c0e29eb76d69df166935..b738a8a6b88cea763bf57175ce33c09fb9301ff2
--- 1/2019/program/grid-schedule.html
--- 2/2019/program/grid-schedule.html
+++ b/2019/program/grid-schedule.html
@@@ -109,7 -109,7 +109,7 @@@
    </tr>
    <tr>
      <td class="tg-jnby">10:00</td>
-     <td class="tg-jnby" colspan="3">Keynote - Micky Metts</td>
+     <td class="tg-jnby" colspan="3">Keynote - Bdale Garbee</td>
    </tr>
    <tr>
      <td class="tg-ao2g">10:55</td>
@@@ -125,7 -125,7 +125,7 @@@
    </tr>
    <tr>
      <td class="tg-ao2g"><br>12:35</td>
 -    <td class="tg-ao2g" colspan="3">Lunch</td>
 +    <td class="tg-ao2g" colspan="3">Lunch and <a href="https://libreplanet.org/wiki/LibrePlanet:Conference/2019/sunday_members_lunch">Associate members' meeting</a></td>
    </tr>
    <tr>
      <td class="tg-jnby">13:35</td>
@@@ -149,11 -149,11 +149,11 @@@
      <td class="tg-ao2g">16:20</td>
      <td class="tg-ao2g">Modern Emacs IDE<br></td>
      <td class="tg-ao2g">Security by & for free software<br></td>
-     <td class="tg-ao2g">TBA<br></td>
+     <td class="tg-ao2g">Saving democracy with the Web's infrastructure<br></td>
    </tr>
    <tr>
      <td class="tg-jnby">17:15</td>
-     <td class="tg-jnby" colspan="3">Keynote - Bdale Garbee</td>
+     <td class="tg-jnby" colspan="3">Keynote - Micky Metts</td>
    </tr>
      <tr>
      <td class="tg-ao2g">18:00</td>
@@@ -164,8 -164,12 +164,8 @@@
  
  <!--#include virtual="/2019/includes/footer.html"-->
  <!--#include virtual="/2019/includes/common_js.html"-->
 -<<<<<<< HEAD
  <!--#include virtual="/2019/includes/program_js.html"-->
 -
 -=======
  <script type="text/javascript">
  $("#p-grid-sch").addClass("active").text("Grid Schedule");
  </script>
 ->>>>>>> 11f1da5c36cf1aec031e587ea41073b7b6db7506
  <!--#include virtual="/2019/includes/close.html" -->