From b51c47fccf7a54973c6e0394c39ec874bc9b8df9 Mon Sep 17 00:00:00 2001 From: Joshua Simmons Date: Mon, 14 Aug 2017 18:53:08 -0700 Subject: [PATCH] you have got to be fucking kidding me --- pinaxcon/templates/static_pages/about/colophon.html | 2 +- pinaxcon/templates/static_pages/terms_and_conditions.md | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pinaxcon/templates/static_pages/about/colophon.html b/pinaxcon/templates/static_pages/about/colophon.html index 81868f7..2e962de 100644 --- a/pinaxcon/templates/static_pages/about/colophon.html +++ b/pinaxcon/templates/static_pages/about/colophon.html @@ -35,7 +35,7 @@

Terms and Conditions

-

Our Terms and Conditions were forked from the Linux Australia Event Terms and Conditions under the Creative Commons Attribution Share Alike 3.0 Australia license. Our Photography and Audio Video Recording policy is adapted from the Evergreen policy, itself adapted from the AdaCamp policy under a Creative Commons Attribution Share Alike 4.0 International license.

+

Our Terms and Conditions were forked from the Linux Australia Event Terms and Conditions under the GNU General Public License v3.0. Our Photography and Audio Video Recording policy is adapted from the Evergreen policy, itself adapted from the AdaCamp policy under a Creative Commons Attribution Share Alike 4.0 International license.

Web Application

diff --git a/pinaxcon/templates/static_pages/terms_and_conditions.md b/pinaxcon/templates/static_pages/terms_and_conditions.md index 6672d8a..49fad46 100644 --- a/pinaxcon/templates/static_pages/terms_and_conditions.md +++ b/pinaxcon/templates/static_pages/terms_and_conditions.md @@ -1,4 +1,6 @@ -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"). + + Registration ------------