From: Zak Rogoff <zak@fsf.org>
Date: Fri, 4 Oct 2013 17:14:28 +0000 (-0400)
Subject: Merge branch 'stable' of vcs.fsf.org:libreplanet-static into stable
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=6cc3cc124e02be9594356be4ec097188ab5318cd;p=libreplanet-static.git

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

6cc3cc124e02be9594356be4ec097188ab5318cd
diff --cc 2014/anti-harassment/index.html
index 3dc3ba6b,38edb478..0033953d
--- a/2014/anti-harassment/index.html
+++ b/2014/anti-harassment/index.html
@@@ -17,9 -17,9 +17,9 @@@
  		  <div class="row">
  			<div class="col-sm-7"> <!-- start of lp header -->
  			  <div class="lp-head">
- 				<h1><a href="/2014/"> LibrePlanet <small>2014</small></a></h1>
+ 				<h1><a href="/server/staging/lpc14"> LibrePlanet <small>2014</small></a></h1>
  				<p><strong>March 23rd-24th 2014 in Cambridge, MA</strong></p>
 -				<p class="text-muted">The yearly conference of the free software community.</p>
 +				<p class="text-muted">The yearly conference of the free software community</p>
  			  </div>
  			</div><!-- end of lp header -->
  			<div class="col-sm-5"> <!-- start of signup form -->
diff --cc 2014/javascript/index.html
index 5512537a,59280f6b..d641a404
--- a/2014/javascript/index.html
+++ b/2014/javascript/index.html
@@@ -16,9 -16,9 +16,9 @@@
  		  <div class="row">
  			<div class="col-sm-7"> <!-- start of lp header -->
  			  <div class="lp-head">
- 				<h1><a href="/2014/"> LibrePlanet <small>2014</small></a></h1>
+ 				<h1><a href="/server/staging/lpc14"> LibrePlanet <small>2014</small></a></h1>
  				<p><strong>March 23rd-24th 2014 in Cambridge, MA</strong></p>
 -				<p class="text-muted">The yearly conference of the free software community.</p>
 +				<p class="text-muted">The yearly conference of the free software community</p>
  			  </div>
  			</div><!-- end of lp header -->
  			<div class="col-sm-5"> <!-- start of signup form -->
diff --cc server/staging/lpc14/index.html
index 24f3dc43,6d7ef420..bec67924
--- a/server/staging/lpc14/index.html
+++ b/server/staging/lpc14/index.html
@@@ -17,9 -17,9 +17,9 @@@
  		  <div class="row">
  			<div class="col-sm-7"> <!-- start of lp header -->
  			  <div class="lp-head">
- 				<h1><a href="/2014/"> LibrePlanet <small>2014</small></a></h1>
+ 				<h1><a href="/server/staging/lpc14"> LibrePlanet <small>2014</small></a></h1>
  				<p><strong>March 23rd-24th 2014 in Cambridge, MA</strong></p>
 -				<p class="text-muted">The yearly conference of the free software community.</p>
 +				<p class="text-muted">The yearly conference of the free software community</p>
  			  </div>
  			</div><!-- end of lp header -->
  			<div class="col-sm-5"> <!-- start of signup form -->