From: yomguy <yomguy@parisson.com>
Date: Mon, 17 Sep 2012 16:45:24 +0000 (+0200)
Subject: Merge branch 'dev' into crem
X-Git-Tag: 1.4.5~2^2~4^2~2^2~33^2~24^2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=c1c04ef5232180ea07b5a271d2c0f6b1ecd06de6;p=telemeta.git

Merge branch 'dev' into crem

Conflicts:
	telemeta/templates/telemeta/base.html
---

c1c04ef5232180ea07b5a271d2c0f6b1ecd06de6
diff --cc telemeta/templates/telemeta/base.html
index 42243791,f798fd34..73fda62c
--- a/telemeta/templates/telemeta/base.html
+++ b/telemeta/templates/telemeta/base.html
@@@ -45,7 -45,7 +45,7 @@@
  <div id="header">
  <div id="logo">
  {% block logo %}
- <a href="{% url telemeta-home %}"><img src="{% url telemeta-images "logo_crem.png" %}" alt="Telemeta" /></a>
 -<a href="{% url telemeta-home %}"><img src="{{ STATIC_URL }}telemeta/images/logo_lam3.png" alt="Telemeta" /></a>
++<a href="{% url telemeta-home %}"><img src="{{ STATIC_URL }}telemeta/images/logo_crem.png" alt="Telemeta" /></a>
  {% endblock %}
  </div>