From 9501ea21cd18644bd4ad4b5f1667cbc20b79b864 2018-07-04 19:49:42
From: Josh Simmons <joshuasimmons@google.com>
Date: 2018-07-04 19:49:42
Subject: [PATCH] update photo credit and add timvideos

---

diff --git a/pinaxcon/templates/static_pages/about/colophon.html b/pinaxcon/templates/static_pages/about/colophon.html
index 3cc72db44d8f074b4bbe2e6bd42b908c8de45cae..2dc2f66785189f1174ca021e252883ba493570e1 100644
--- a/pinaxcon/templates/static_pages/about/colophon.html
+++ b/pinaxcon/templates/static_pages/about/colophon.html
@@ -25,7 +25,7 @@
 <h2>Photography</h2>
 
 <ul>
-  <li>Photo of <a href="https://www.instagram.com/p/BU-G5dGAkHt">Mystic Theatre</a> used on the home page by Christopher Neugebauer under the <a href="https://creativecommons.org/licenses/by-sa/2.0/" >Creative Commons Attribute Share Alike 2.0 Generic</a> license.</li>
+  <li>Photo of <a href="https://www.instagram.com/p/BcOVJJRFWfF">Mystic Theatre</a> used on the home page by Esten Hurtle under the <a href="https://creativecommons.org/licenses/by-sa/2.0/" >Creative Commons Attribute Share Alike 2.0 Generic</a> license.</li>
   <li>Photo of <a href="https://www.flickr.com/photos/richard_jones/14638274749">DjangoGirls Brisbane 2014</a> used on the home page by Richard Jones under the <a href="https://creativecommons.org/licenses/by/2.0/">Creative Commons Attribution 2.0 Generic</a> license.</li>
 </ul>
 
@@ -42,15 +42,16 @@
 <p>
   Our <a href="/terms-and-conditions">Terms and Conditions</a> were forked from the <a href="https://github.com/linuxaustralia/constitution_and_policies/blob/master/terms_and_conditions.md">Linux Australia Event Terms and Conditions</a> under the <a href="https://creativecommons.org/licenses/by-sa/3.0/au/">Creative Commons Attribution Share Alike 3.0 Australia</a> license. Our Photography and Audio Video Recording policy is adapted from the <a href="https://evergreen-ils.org/conference/photography-policy/">Evergreen policy</a>, itself adapted from the <a href="https://adacamp.org/adacamp-toolkit/policies/#photo">AdaCamp policy</a> under a <a href="http://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution Share Alike 4.0 International</a> license.</p>
 
-<h2>Web Application</h2>
+<h2>Free and Open Source Software</h2>
 
-<p>Our website is powered by a heap of free and open source software, most notably:</p>
+<p>We use as much free and open source software as we can, including:</p>
 
 <ul>
   <li><a href="https://www.djangoproject.com/">Django</a> is the web framework that underpins everything else.</li>
   <li><a href="https://github.com/chrisjrn/symposion/">Symposion</a> is used for the call for proposals and session scheduling.</li>
   <li><a href="http://github.com/chrisjrn/registrasion/">Registrasion</a> is used for ticket sales.</li>
   <li><a href="https://inkscape.org/">Inkscape</a> is used to create most of our graphics.</li>
+  <li><a href="https://github.com/timvideos">TimVideos.us</a> is used to stream and record conference talks.</li>
 </ul>
 
 {% endblock %}