From bc95ecb17f3b9447a41d6ee6b51b24dda1855413 2018-07-04 20:18:56
From: Josh Simmons <joshuasimmons@google.com>
Date: 2018-07-04 20:18:56
Subject: [PATCH] Merge branch 'master' of github.com:northbaypython/website

---

diff --git a/pinaxcon/templates/site_base.html b/pinaxcon/templates/site_base.html
index 7221a58e51af3c3089b67dbf1ae47d45561bbeea..fd212db75fc36b89599481099a750f45ca560b44 100644
--- a/pinaxcon/templates/site_base.html
+++ b/pinaxcon/templates/site_base.html
@@ -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 %}
diff --git a/pinaxcon/templates/symposion/sponsorship/list.html b/pinaxcon/templates/symposion/sponsorship/list.html
index 107612409db9f9a4e00693b5e8960ba0cdcce4ea..c6a077f0d6a003a62d1210424cf50debdea3e561 100644
--- a/pinaxcon/templates/symposion/sponsorship/list.html
+++ b/pinaxcon/templates/symposion/sponsorship/list.html
@@ -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 %}
diff --git a/pinaxcon/urls.py b/pinaxcon/urls.py
index 6c6e58073ba5e4a555ca971f3badc0606c461d75..bd3b9793f17622ab0b606c1c7b3deb3e0749b8f0 100644
--- a/pinaxcon/urls.py
+++ b/pinaxcon/urls.py
@@ -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")),