Merging changes from other branches
authorGreg Wilson <gvwilson@third-bit.com>
Tue, 10 Jan 2017 00:59:11 +0000 (19:59 -0500)
committerGreg Wilson <gvwilson@third-bit.com>
Tue, 10 Jan 2017 00:59:11 +0000 (19:59 -0500)
commita4ab656050a01ac3b26ce7e28a4915f66cdf3b30
tree5107d980b5a59f972a94ed0eb9fca0685b9fdd59
parentd5f879ab60b162f4e615db0844844d9379110624
parentd62084b62d61783c179802b71661d48db5c05c18
Merging changes from other branches
_includes/carpentries.html
_includes/workshop_footer.html