Fixing conflicts in header.
authorZak Rogoff <zak@fsf.org>
Tue, 2 Sep 2014 20:40:25 +0000 (16:40 -0400)
committerZak Rogoff <zak@fsf.org>
Tue, 2 Sep 2014 20:40:25 +0000 (16:40 -0400)
2015/header.html

index 452464bc51823f253ca5f13645b138d0828c18cd..c99350c3747991932573d4dc344078b1b39988f3 100755 (executable)
               <li><a href="/2015/getting_around">Getting around Cambridge</a></li>
               <!--<li><a href="/2015/scholarships">Scholarships (until January 10th)</a></li>-->
               <!--<li><a href="/2015/live">Participate online</a></li>-->
+
               <li><a href="/2015/scholarship_donation">Donate to the scholarship fund</a></li>
             </ul>
 
                  Share your ideas
                 </a>
               </li>
+
               <li><a href="http://media.libreplanet.org/">Videos of previous conferences</a></li>
 
+              <li><a href="http://media.libreplanet.org/">LibrePlanet 2013 videos</a></li>
               <li><a href="/2015/anti-harassment/">Anti-harassment policy</a></li>
               <li class="fsf-donate">
                 <a href="https://my.fsf.org/associate/support_freedom">