CopyleftConf/copyleftconf-website Changeset - bc95ecb17f3b

Changeset - bc95ecb17f3b

Parent rev.

Child rev.

[Not reviewed]

Merge

0 6 1

Josh Simmons - 6 years ago 2018-07-04 20:18:56
joshuasimmons@google.com

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

3 files changed with 6 insertions and 6 deletions:

pinaxcon/templates/site_base.html

pinaxcon/templates/symposion/sponsorship/list.html

pinaxcon/urls.py

0 comments (0 inline, 0 general)

pinaxcon/templates/site_base.html

➞

Show inline comments

@@ ... / @@ -20,5 +20,5 @@ @@
       <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">

pinaxcon/templates/symposion/sponsorship/list.html

➞

Show inline comments

@@ ... / @@ -3,3 +3,3 @@ @@
 {% 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 %}

pinaxcon/urls.py

➞

Show inline comments

@@ ... / @@ -44,4 +44,4 @@ urlpatterns = [ @@
 #    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"),

0 comments (0 inline, 0 general)