From: Radek Czajka <radekczajka@nowoczesnapolska.org.pl>
Date: Fri, 31 Jan 2014 14:51:59 +0000 (+0100)
Subject: Merge branch 'leveling'
X-Git-Url: https://git.mdrn.pl/edumed.git/commitdiff_plain/118fd7ac41a586001b4c8f45c149731cc9a2e586?ds=sidebyside

Merge branch 'leveling'

Conflicts:
	edumed/settings.d/30-apps.py
---

118fd7ac41a586001b4c8f45c149731cc9a2e586
diff --cc edumed/settings.d/30-apps.py
index f7defa1,ee80ab7..d9eb0e6
--- a/edumed/settings.d/30-apps.py
+++ b/edumed/settings.d/30-apps.py
@@@ -3,7 -3,7 +3,8 @@@ INSTALLED_APPS = 
      'curriculum',
      'catalogue',
      'comment',
 +    'wtem',
+     'publishers',
  
      'fnpdjango',
      'south',
diff --cc edumed/templates/base_super.html
index 8f2886b,9607254..b3ba9d8
--- a/edumed/templates/base_super.html
+++ b/edumed/templates/base_super.html
@@@ -96,7 -97,8 +97,7 @@@
          </footer>
  
      <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js"></script>
 -    {% compressed_js 'base' %}
      {% block extra_script %}{% endblock %}
-     {{ piwik_tag|safe }}
+     {% tracking_code %}
      </body>
  </html>