Merge branch 'master' of github.com:jitsi/jitmeet

This commit is contained in:
Philipp Hancke 2014-01-28 11:56:15 +01:00
commit 2977d67e4f
1 changed files with 12 additions and 12 deletions

View File

@ -2,19 +2,19 @@
<head>
<title>WebRTC, meet the Jitsi Videobridge</title>
<script src="//ajax.googleapis.com/ajax/libs/jquery/2.0.3/jquery.min.js"></script>
<script src="libs/strophejingle.bundle.js?v=3"></script><!-- strophe.jingle bundle -->
<script src="libs/colibri.js?v=3"></script><!-- colibri focus implementation -->
<script src="muc.js?v=3"></script><!-- simple MUC library -->
<script src="estos_log.js?v=1"></script><!-- simple stanza logger -->
<script src="app.js?v=10"></script><!-- application logic -->
<script src="libs/strophejingle.bundle.js?v=7"></script><!-- strophe.jingle bundle -->
<script src="libs/colibri.js?v=6"></script><!-- colibri focus implementation -->
<script src="muc.js?v=4"></script><!-- simple MUC library -->
<script src="estos_log.js?v=3"></script><!-- simple stanza logger -->
<script src="app.js?v=13"></script><!-- application logic -->
<link href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" rel="stylesheet">
<link rel="stylesheet" type="text/css" media="screen" href="css/main.css?v=10"/>
<link rel="stylesheet" href="css/jquery-impromptu.css?v=2">
<link rel="stylesheet" href="css/modaldialog.css?v=2">
<script src="libs/jquery-impromptu.js"></script>
<script src="libs/jquery.autosize.js"></script>
<script src="config.js"></script><!-- adapt to your needs, i.e. set hosts and bosh path -->
<script src="libs/prezi_player.js"></script>
<link rel="stylesheet" type="text/css" media="screen" href="css/main.css?v=11"/>
<link rel="stylesheet" href="css/jquery-impromptu.css?v=4">
<link rel="stylesheet" href="css/modaldialog.css?v=4">
<script src="libs/jquery-impromptu.js?v=4"></script>
<script src="libs/jquery.autosize.js?v=4"></script>
<script src="config.js?v=5"></script><!-- adapt to your needs, i.e. set hosts and bosh path -->
<script src="libs/prezi_player.js?v=3"></script>
</head>
<body>
<div id="header">