Commit 37700c28 authored by okhin's avatar okhin
Browse files

Merge branch 'django-1.8' into 'master'

Django 1.8 - Integrating EDRI

Integrating EDRI logo, and finalizing thngs before going live on production.

See merge request !5
parents 00436026 60702dd7
......@@ -16,12 +16,10 @@
<li class="logo-org"><img alt="BoF logo" src="{%media_url%}/img/bof.png" /><a href="">Bits of Freedom</a></li>
<li class="logo-org"><img alt="LQDN logo" src="{%media_url%}/img/lqdn.png" /><a href="">La Quadrature du Net</a></li>
<h3>{% trans "Supporters" %}</h3>
<li class="logo-org"><img alt="ORG logo" src="{%media_url%}/img/org.png" /><a href="">Open Rights Group</a></li>
<li class="logo-org"><img alt="NURPA logo" src="{%media_url%}/img/nurpa.png" width="80" style="text-align: center; background:#446688"/><br /><a href=""><small>Net Users' Rights Protection Association</small></a></li>
<li class="logo-org"><img alt="XNet logo" src="{%media_url%}/img/xnet.png" /><a href="">X&nbsp;Net</a></li>
<li class="logo-org"><img alt="EDRI logo" src="{%media_url%}/img/edri.png" /><a href="">X&nbsp;Net</a></li>
{% endblock %}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment