Merge remote-tracking branch 'origin/master' into prod

This commit is contained in:
Christopher Neugebauer 2017-11-11 15:39:49 -08:00
commit 25db679112

View file

@ -24,6 +24,7 @@
<p>
<a href="https://facebook.com/northbaypython">Facebook</a>
| <a href="https://twitter.com/northbaypython">Twitter</a>
| <a href="/accessibility">Accessibility</a>
| <a href="/code-of-conduct">Code of Conduct</a>
| <a href="/terms">Terms and Conditions</a>
| <a href="/about/colophon">Colophon</a>