CopyleftConf/copyleftconf-website
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:northbaypython/website

Browse source
This commit is contained in:
Joshua Simmons 2017-08-16 06:38:06 -07:00
commit 028e006d02
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pinaxcon/templates/static_pages/about/colophon.html
View file

@ -12,7 +12,7 @@
<h2>Call for Proposals</h2> <h2>Call for Proposals</h2>
<p>Portions of our <a href="/program/call-for-proposals" title="North Bay Python Call for Proposals">Call for Proposals</a> page were drawn from ideas seen on <a href="https://djangocon.eu" title="DjangoCon Europe">DjangoCon EU</a>, <a href="https://seagl.org" title="Seattle GNU Linux">SeaGL</a>, <a href="http://www.fogcityruby.com/speak/" title="Fog City Ruby">Fog City Ruby</a>, and others. Thanks to all for their inspiration and permission to borrow!</p> <p>Portions of our Call for Proposals page were drawn from ideas seen on <a href="https://djangocon.eu" title="DjangoCon Europe">DjangoCon EU</a>, <a href="https://seagl.org" title="Seattle GNU Linux">SeaGL</a>, <a href="http://www.fogcityruby.com/speak/" title="Fog City Ruby">Fog City Ruby</a>, and others. Thanks to all for their inspiration and permission to borrow!</p>
<h2>Code of Conduct</h2> <h2>Code of Conduct</h2>