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:
Josh Simmons 2018-07-04 13:18:56 -07:00
commit bc95ecb17f
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pinaxcon/templates/site_base.html
View file

@ -18,9 +18,9 @@
<meta property="og:site_name" content="North Bay Python">
<meta property="og:image" content="http://{{ request.META.HTTP_HOST }}{% static "images/square_icon.png" %}">
<meta property="og:url" content="{{ request.build_absolute_uri }}">
<meta property="og:description" content="North Bay Python, a community-organized conference, comes to Petaluma, California on December 2 and 3, 2017.">
<meta property="twitter:description" content="North Bay Python, a community-organized conference, comes to Petaluma, California on December 2 and 3, 2017.">
<meta name="description" content="North Bay Python, a community-organized conference, comes to Petaluma, California on December 2 and 3, 2017.">
<meta property="og:description" content="North Bay Python, a community-organized conference, returns to Petaluma, California on November 3 and 4, 2018.">
<meta property="twitter:description" content="North Bay Python, a community-organized conference, returns to Petaluma, California on November 3 and 4, 2018.">
<meta name="description" content="North Bay Python, a community-organized conference, returns to Petaluma, California on November 3 and 4, 2018.">
<meta name="google-site-verification" content="sTU0G4IghY_jV9iPgCVD1WZuk4C_MSWY2QzxQUjDcC4">
{% endblock %}
{% endblock %}

2
pinaxcon/templates/symposion/sponsorship/list.html
View file

@ -1,5 +1,5 @@
{% extends "symposion/sponsorship/list_.html" %}
{% block lede %}
We're grateful to the following organizations, who've made a substantial contribution to North Bay Python 2017. Learn how you can join us on the <a href="/sponsors/become-a-sponsor" title="Become a North Bay Python Sponsor">Become a Sponsor</a> page.
We're grateful to the following organizations, who've made a substantial contribution to North Bay Python 2018. Learn how you can join us on the <a href="/sponsors/become-a-sponsor" title="Become a North Bay Python Sponsor">Become a Sponsor</a> page.
{% endblock %}

4
pinaxcon/urls.py
View file

@ -42,8 +42,8 @@ urlpatterns = [
url(r"^attend/travel$", TemplateView.as_view(template_name="static_pages/attend/travel.html"), name="attend/travel"),
# url(r"^attend/hotels$", TemplateView.as_view(template_name="static_pages/attend/hotels.html"), name="attend/hotels"),
# url(r"^attend/tshirt$", TemplateView.as_view(template_name="static_pages/attend/tshirt.html"), name="attend/tshirt"),
# url(r"^attend/accessibility-and-accommodations$",TemplateView.as_view(template_name="static_pages/attend/accommodations.html"), name="attend/accessibility-and-accommodations"),
# url(r"^accessibility$", RedirectView.as_view(url="attend/accessibility-and-accommodations")),
url(r"^attend/accessibility-and-accommodations$",TemplateView.as_view(template_name="static_pages/attend/accommodations.html"), name="attend/accessibility-and-accommodations"),
url(r"^accessibility$", RedirectView.as_view(url="attend/accessibility-and-accommodations")),
# url(r"^guides$",TemplateView.as_view(template_name="static_pages/attend/guides.html"), name="attend/guides"),
# url(r"^guide$", RedirectView.as_view(url="guides")),