Changeset - b18356ab87a6
[Not reviewed]
Merge
0 2 0
Josh Simmons - 4 years ago 2017-08-15 01:55:41
joshuasimmons@google.com
Merge pull request #48 from northbaypython/josh/copy

GRUMBLE
2 files changed with 4 insertions and 2 deletions:
0 comments (0 inline, 0 general)
pinaxcon/templates/static_pages/about/colophon.html
Show inline comments
...
 
@@ -35,7 +35,7 @@
 

	
 
<h2>Terms and Conditions</h2>
 

	
 
<p>Our <a href="/terms-and-conditions" title="North Bay Python 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" title="Linux Australia Terms and Conditions">Linux Australia Event Terms and Conditions</a> under the <a href="https://creativecommons.org/licenses/by-sa/3.0/au/" title="Creative Commons Attribution Share Alike 3.0 Australia License">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/" title="Evergreen Event Photography Policy">Evergreen policy</a>, itself adapted from the <a href="https://adacamp.org/adacamp-toolkit/policies/#photo" title="AdaCamp Event Photography Policy">AdaCamp policy</a> under a <a href="http://creativecommons.org/licenses/by-sa/4.0/" title="Creative Commons Attribution Share Alike 4.0 International License">Creative Commons Attribution Share Alike 4.0 International</a> license.</p>
 
<p>Our <a href="/terms-and-conditions" title="North Bay Python 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" title="Linux Australia Terms and Conditions">Linux Australia Event Terms and Conditions</a> under the <a href="https://github.com/linuxaustralia/constitution_and_policies/blob/master/LICENCE.md" title="GNU General Public License v3.0">GNU General Public License v3.0</a>. Our Photography and Audio Video Recording policy is adapted from the <a href="https://evergreen-ils.org/conference/photography-policy/" title="Evergreen Event Photography Policy">Evergreen policy</a>, itself adapted from the <a href="https://adacamp.org/adacamp-toolkit/policies/#photo" title="AdaCamp Event Photography Policy">AdaCamp policy</a> under a <a href="http://creativecommons.org/licenses/by-sa/4.0/" title="Creative Commons Attribution Share Alike 4.0 International License">Creative Commons Attribution Share Alike 4.0 International</a> license.</p>
 

	
 
<h2>Web Application</h2>
 

	
pinaxcon/templates/static_pages/terms_and_conditions.md
Show inline comments
 
These Terms and Conditions apply to all attendees who have registered for North Bay Python. This doucment was forked from the [Linux Australia Event Terms and Conditions](https://github.com/linuxaustralia/constitution_and_policies/blob/master/terms_and_conditions.md "Linux Australia Event Terms and Conditions Template") under the [Creative Commons Attribution Share Alike 3.0 Australia](https://creativecommons.org/licenses/by-sa/3.0/au/ "Creative Commons Attribution Share Alike 3.0 Australia License") license.
 
These Terms and Conditions apply to all attendees who have registered for North Bay Python. This doucment was forked from the [Linux Australia Event Terms and Conditions](https://github.com/linuxaustralia/constitution_and_policies/blob/master/terms_and_conditions.md "Linux Australia Event Terms and Conditions Template") under the [GNU General Public License v3.0](https://github.com/linuxaustralia/constitution_and_policies/blob/master/LICENCE.md "GNU General Public License v3.0").
 

	
 
 <a href="" title="GNU General Public License v3.0"></a>
 

	
 
Registration
 
------------
0 comments (0 inline, 0 general)