merge changes from pandora

This commit is contained in:
j 2010-09-05 14:59:24 +02:00
commit 0a63490697
3 changed files with 863 additions and 1696 deletions

View file

@ -4,7 +4,7 @@
<title>{{settings.SITENAME}}</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<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/jquery-1.4.2.js"></script>
<script type="text/javascript" src="/static/js/jquery/jquery.videosupport.js"></script>
<script type="text/javascript" src="/static/oxjs/build/js/ox.js"></script>
@ -12,6 +12,5 @@
<script type="text/javascript" src="/site.js"></script>
<script type="text/javascript" src="/static/js/pandora.js"></script>
</head>
<body>
</body>
</html>
<body></body>
</html>