Changeset - 76d87f27c1aa
[Not reviewed]
Merge
0 3 0
Christopher Neugebauer - 6 years ago 2017-10-11 00:51:06
chrisjrn@gmail.com
Merge branch 'master' into prod
3 files changed with 13 insertions and 2 deletions:
0 comments (0 inline, 0 general)
fixtures/sitetree.json
Show inline comments
...
 
@@ -543,3 +543,3 @@
 
        "hint": "",
 
        "url": "/attend/business-cases",
 
        "url": "/attend/business-case",
 
        "urlaspattern": false,
pinaxcon/templates/_footer.html
Show inline comments
 
{% load staticfiles %}
 
{% load sponsorship_tags %}
 
<div class="row">
...
 
@@ -12,2 +13,12 @@
 

	
 
    {% sponsors "platinum" as platinum %}
 

	
 
    <p>We acknowledge the support of our Platinum sponsor{{ platinum|length|pluralize}},
 
      {% for sponsor in platinum %}
 
        {% if forloop.last and not forloop.first %}
 
          and
 
        {% endif %}
 
        {{ sponsor }}{% if forloop.last %}.{% endif %}
 
      {% endfor %}
 

	
 
    <p>
pinaxcon/templates/static_pages/news.html
Show inline comments
...
 
@@ -15,3 +15,3 @@
 

	
 
<p><span class="date">Thursday, October 5, 2017</span>&mdash;We are excited to announce that <a href="https://2017.northbaypython.org/tickets">tickets are now on sale</a> for North Bay Python 2017. With just two months until the conference we have a few key dates coming up:</p>
 
<p><span class="date">Friday, October 6, 2017</span>&mdash;We are excited to announce that <a href="https://2017.northbaypython.org/tickets">tickets are now on sale</a> for North Bay Python 2017. With just two months until the conference we have a few key dates coming up:</p>
 

	
0 comments (0 inline, 0 general)