From: Greg Wilson <gvwilson@third-bit.com>
Date: Tue, 10 Jan 2017 00:59:11 +0000 (-0500)
Subject: Merging changes from other branches
X-Git-Url: https://git.arvados.org/rnaseq-cwl-training.git/commitdiff_plain/a4ab656050a01ac3b26ce7e28a4915f66cdf3b30

Merging changes from other branches
---

a4ab656050a01ac3b26ce7e28a4915f66cdf3b30
diff --cc _includes/workshop_footer.html
index 71a227a,c618999..3ae63e6
--- a/_includes/workshop_footer.html
+++ b/_includes/workshop_footer.html
@@@ -1,13 -1,13 +1,16 @@@
+ {% comment %}
+   Footer for a standard workshop.
+ {% endcomment %}
  <footer>
    <div class="row">
 -    <div class="col-md-6" align="left">
 +    <div class="col-md-4" align="left">
        <h4><a href="{{ site.swc_site }}">Software Carpentry</a></h4>
      </div>
 -    <div class="col-md-6" align="right">
 +    <div class="col-md-4" align="right">
        <h4><a href="{{ site.dc_site }}">Data Carpentry</a></h4>
      </div>
 +    <div class="col-md-4" align="right">
 +      <h4><a href="{{ site.lc_site }}">Library Carpentry</a></h4>
 +    </div>
    </div>
  </footer>