Merge branch 'dev' into staging

This commit is contained in:
Oliver Jowett 2019-09-11 13:05:31 +08:00
commit 089684e20f

View file

@ -2,7 +2,7 @@
<html> <html>
<head> <head>
<meta charset="utf-8"/> <meta charset="utf-8"/>
<link rel="stylesheet" type="text/css" href="style.css?v=2" /> <link rel="stylesheet" type="text/css" href="style.css?v=3.7.2" />
<link rel="stylesheet" href="jquery/jquery-ui-1.11.4-smoothness.css" /> <link rel="stylesheet" href="jquery/jquery-ui-1.11.4-smoothness.css" />
<script src="jquery/jquery-3.0.0.min.js"></script> <script src="jquery/jquery-3.0.0.min.js"></script>
<script src="jquery/jquery-ui-1.11.4.min.js"></script> <script src="jquery/jquery-ui-1.11.4.min.js"></script>
@ -14,15 +14,15 @@
<link rel="stylesheet" href="ol/ol3-layerswitcher.css" type="text/css"/> <link rel="stylesheet" href="ol/ol3-layerswitcher.css" type="text/css"/>
<script src="ol/ol3-layerswitcher.js" type="text/javascript"></script> <script src="ol/ol3-layerswitcher.js" type="text/javascript"></script>
<script type="text/javascript" src="config.js"></script> <script type="text/javascript" src="config.js?v=3.7.2"></script>
<script type="text/javascript" src="markers.js"></script> <script type="text/javascript" src="markers.js?v=3.7.2"></script>
<script type="text/javascript" src="dbloader.js"></script> <script type="text/javascript" src="dbloader.js?v=3.7.2"></script>
<script type="text/javascript" src="registrations.js"></script> <script type="text/javascript" src="registrations.js?v=3.7.2"></script>
<script type="text/javascript" src="planeObject.js?v=2"></script> <script type="text/javascript" src="planeObject.js?v=3.7.2"></script>
<script type="text/javascript" src="formatter.js?v=2"></script> <script type="text/javascript" src="formatter.js?v=2?v=3.7.2"></script>
<script type="text/javascript" src="flags.js"></script> <script type="text/javascript" src="flags.js?v=3.7.2"></script>
<script type="text/javascript" src="layers.js"></script> <script type="text/javascript" src="layers.js?v=3.7.2"></script>
<script type="text/javascript" src="script.js?v=2"></script> <script type="text/javascript" src="script.js?v=3.7.2"></script>
<title>PiAware SkyAware</title> <title>PiAware SkyAware</title>
</head> </head>