merge fixes

This commit is contained in:
j 2010-09-05 15:03:16 +02:00
commit 2988346864
2 changed files with 1152 additions and 6 deletions

File diff suppressed because it is too large Load diff

View file

@ -3,6 +3,7 @@
<head> <head>
<title>{{settings.SITENAME}}</title> <title>{{settings.SITENAME}}</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<link rel="shortcut icon" type="image/png" href="/static/png/icon.16.png"/>
<link rel="stylesheet" type="text/css" href="/static/oxjs/build/css/ox.ui.css"/> <link rel="stylesheet" type="text/css" href="/static/oxjs/build/css/ox.ui.css"/>
<script type="text/javascript" src="/static/oxjs/build/js/ox.load.js"></script> <script type="text/javascript" src="/static/oxjs/build/js/ox.load.js"></script>
<script type="text/javascript" src="/static/oxjs/build/js/jquery-1.4.2.js"></script> <script type="text/javascript" src="/static/oxjs/build/js/jquery-1.4.2.js"></script>