summaryrefslogtreecommitdiff
path: root/ishtar/templates/base.html
diff options
context:
space:
mode:
authorzarkam <zarkam@zarkam.(none)>2011-01-29 13:24:20 +0100
committerzarkam <zarkam@zarkam.(none)>2011-01-29 13:24:20 +0100
commitc9a1754903035260f837c2a5d4ea9b6fe3a76ffb (patch)
treed1d385f9f529231bf500550dce9f37342d8e8187 /ishtar/templates/base.html
parent656f4a1e0d359b873d40c9df6ab951fb90637d10 (diff)
parent0883d7029ebdb4a934407c95c19745b13fe558ca (diff)
downloadIshtar-c9a1754903035260f837c2a5d4ea9b6fe3a76ffb.tar.bz2
Ishtar-c9a1754903035260f837c2a5d4ea9b6fe3a76ffb.zip
Merge branch 'master' of ssh://lysithea.proxience.com/home/proxience/git/ishtar
Diffstat (limited to 'ishtar/templates/base.html')
-rw-r--r--ishtar/templates/base.html2
1 files changed, 2 insertions, 0 deletions
diff --git a/ishtar/templates/base.html b/ishtar/templates/base.html
index e726cf782..22e6d4239 100644
--- a/ishtar/templates/base.html
+++ b/ishtar/templates/base.html
@@ -16,6 +16,8 @@
<script language="javascript" type="text/javascript" src="{{JQUERY_UI_URL}}ui/i18n/jquery.ui.datepicker-{{COUNTRY}}.js"></script>
<script language="javascript" type="text/javascript" src="{{MEDIA_URL}}/js/ishtar.js"></script>
<link type="text/css" href="{{JQUERY_UI_URL}}css/smoothness/jquery-ui.css" rel="stylesheet" />
+ {% block extra_head %}
+ {% endblock %}
</head>
<body>
<div id="header">