fnp / prawokultury.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 323a191 116e12f)
Merge branch 'master' of github.com:fnp/prawokultury
authorMarcin Koziej <marcin.koziej@nowoczesnapolska.org.pl>
Tue, 28 Aug 2012 14:58:02 +0000 (16:58 +0200)
committerMarcin Koziej <marcin.koziej@nowoczesnapolska.org.pl>
Tue, 28 Aug 2012 14:58:02 +0000 (16:58 +0200)
1  2 
prawokultury/templates/base.html patch | diff1 | diff2 | blob | history

diff --combined prawokultury/templates/base.html
index ecbd5b2,c7eec44..db10839
--- 1/prawokultury/templates/base.html
--- 2/prawokultury/templates/base.html
+++ b/prawokultury/templates/base.html
@@@ -6,13 -6,10 +6,11 @@@
  <html>
      <head>
          <title>{% trans "Culture's right" %}</title>
 +       <link rel="shortcut icon" type="image/png" href="{% static "img/favicon.png" %}" />
          {% compressed_css 'base' %}
      </head>
      <body>
      <div id="body">
-         <!--img src="/static/a.jpg" style="position:absolute; opacity: .5;z-index: 1000;" /-->
- 
          <div id="header-bar">
          <div class="bar-left">
              <a id="logo" href="{% url "migdal_main" %}">