From: Matteo Nastasi <nastasi@alternativeoutput.it>
Date: Sat, 18 Apr 2020 09:35:24 +0000 (+0200)
Subject: Merge branch 'master' into post-bold2
X-Git-Tag: v5.10.0~55
X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=commitdiff_plain;h=028592d3d195d45f0e19d324c7d7c029a06d0a0c;p=brisk.git

Merge branch 'master' into post-bold2
---

028592d3d195d45f0e19d324c7d7c029a06d0a0c
diff --cc web/index.php
index 269b1fc,66a9780..3dcaf6b
--- a/web/index.php
+++ b/web/index.php
@@@ -1024,26 -1024,25 +1024,26 @@@ supported by:<br
  <title>Brisk</title>
  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
  <link rel="shortcut icon" href="img/brisk_ico.png">
- <script type="text/javascript" src="commons.js"></script>
- <script type="text/javascript" src="fieldify.js"></script>
- <script type="text/javascript" src="prefs.js"></script>
- <script type="text/javascript" src="info.js"></script>
- <!-- <script type="text/javascript" src="myconsole.js"></script> -->
- <script type="text/javascript" src="menu.js"></script>
- <script type="text/javascript" src="heartbit.js"></script>
- <script type="text/javascript" src="xynt-streaming.js"></script>
- <script type="text/javascript" src="preload_img<?php echo langtolng($G_lang); ?>.js"></script>
- <script type="text/javascript" src="room.js"></script>
- <script type="text/javascript" src="md5.js"></script>
- <script type="text/javascript" src="probrowser.js"></script>
- <script type="text/javascript" src="json2.js"></script>
- <script type="text/javascript" src="/cookie_law.js"></script>
- <link rel="stylesheet" type="text/css" href="/cookie_law.css">
- <link rel="stylesheet" type="text/css" href="brisk.css">
- <link rel="stylesheet" type="text/css" href="room.css">
+ <script type="text/javascript" src="commons.js?v=<? echo BSK_BUSTING; ?>"></script>
+ <script type="text/javascript" src="fieldify.js?v=<? echo BSK_BUSTING; ?>"></script>
+ <script type="text/javascript" src="prefs.js?v=<? echo BSK_BUSTING; ?>"></script>
+ <script type="text/javascript" src="info.js?v=<? echo BSK_BUSTING; ?>"></script>
+ <!-- <script type="text/javascript" src="myconsole.js?v=<? echo BSK_BUSTING; ?>"></script> -->
+ <script type="text/javascript" src="menu.js?v=<? echo BSK_BUSTING; ?>"></script>
+ <script type="text/javascript" src="heartbit.js?v=<? echo BSK_BUSTING; ?>"></script>
+ <script type="text/javascript" src="xynt-streaming.js?v=<? echo BSK_BUSTING; ?>"></script>
+ <script type="text/javascript" src="preload_img<?php echo langtolng($G_lang); ?>.js?v=<? echo BSK_BUSTING; ?>"></script>
+ <script type="text/javascript" src="room.js?v=<? echo BSK_BUSTING; ?>"></script>
+ <script type="text/javascript" src="md5.js?v=<? echo BSK_BUSTING; ?>"></script>
+ <script type="text/javascript" src="probrowser.js?v=<? echo BSK_BUSTING; ?>"></script>
+ <script type="text/javascript" src="json2.js?v=<? echo BSK_BUSTING; ?>"></script>
+ <script type="text/javascript" src="/cookie_law.js?v=<? echo BSK_BUSTING; ?>"></script>
+ <link rel="stylesheet" type="text/css" href="/cookie_law.css?v=<? echo BSK_BUSTING; ?>">
+ <link rel="stylesheet" type="text/css" href="brisk.css?v=<? echo BSK_BUSTING; ?>">
+ <link rel="stylesheet" type="text/css" href="room.css?v=<? echo BSK_BUSTING; ?>">
  
  <script type="text/javascript"><!--
 +var myname = null;
  var g_debug = 0;
  var g_lang = "<? echo $G_lang; ?>";
  var g_lng = "<? echo $G_lng; ?>";