CopyleftConf/copyleftconf-website Changeset - 028e006d02bd

Changeset - 028e006d02bd

Parent rev.

Child rev.

[Not reviewed]

Merge

0 2 0

Joshua Simmons - 7 years ago 2017-08-16 13:38:06
i@joshuasimmons.name

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

1 file changed with 1 insertions and 1 deletions:

pinaxcon/templates/static_pages/about/colophon.html

0 comments (0 inline, 0 general)

pinaxcon/templates/static_pages/about/colophon.html

➞

Show inline comments

@@ ... / @@ -12,7 +12,7 @@ @@
 <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>

0 comments (0 inline, 0 general)