fnp / redakcja.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: b8c3430 95c28f5)
Merge remote-tracking branch 'origin/master'
authorJan Szejko <j-sz@o2.pl>
Wed, 16 Mar 2016 14:58:43 +0000 (15:58 +0100)
committerJan Szejko <j-sz@o2.pl>
Wed, 16 Mar 2016 14:58:43 +0000 (15:58 +0100)
1  2 
apps/catalogue/templates/catalogue/base.html patch | diff1 | diff2 | blob | history

diff --combined apps/catalogue/templates/catalogue/base.html
index bad815f,c169f94..fad35c0
--- 1/apps/catalogue/templates/catalogue/base.html
--- 2/apps/catalogue/templates/catalogue/base.html
+++ b/apps/catalogue/templates/catalogue/base.html
@@@ -10,7 -10,7 +10,7 @@@
      {% block add_css %}{% endblock %}
  </head>
  <body>
- 
+ <!--#include file='/pozor.html'-->
  <div id="tabs-nav">
  
      <a href="{% url 'catalogue_document_list' %}">
@@@ -44,7 -44,7 +44,7 @@@
  </div>
  
  
 -<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
 +<script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
  {% javascript 'catalogue' %}
  {% block add_js %}{% endblock %}
  {% block extrabody %}