From 028e006d02bdf8966f4136d42c411a0801252f39 2017-08-16 13:38:06 From: Joshua Simmons Date: 2017-08-16 13:38:06 Subject: [PATCH] Merge branch 'master' of github.com:northbaypython/website --- diff --git a/pinaxcon/templates/static_pages/about/colophon.html b/pinaxcon/templates/static_pages/about/colophon.html index e11a262c6cf8fba83bae7e3f51eb5188d89bb2cc..99d26173fff8f088a1515bae578385ba80eab267 100644 --- a/pinaxcon/templates/static_pages/about/colophon.html +++ b/pinaxcon/templates/static_pages/about/colophon.html @@ -12,7 +12,7 @@

Call for Proposals

-

Portions of our Call for Proposals page were drawn from ideas seen on DjangoCon EU, SeaGL, Fog City Ruby, and others. Thanks to all for their inspiration and permission to borrow!

+

Portions of our Call for Proposals page were drawn from ideas seen on DjangoCon EU, SeaGL, Fog City Ruby, and others. Thanks to all for their inspiration and permission to borrow!

Code of Conduct