Merge branch 'dev' into staging

This commit is contained in:
eric1tran 2021-03-07 05:07:59 +00:00
commit 29d6569ee3
1 changed files with 9 additions and 9 deletions

View File

@ -17,15 +17,15 @@
<script src="noUiSlider/distribute/nouislider.min.js"></script>
<link rel="stylesheet" href="noUiSlider/distribute/nouislider.min.css"/>
<script type="text/javascript" src="config.js?v=4.0"></script>
<script type="text/javascript" src="markers.js?v=4.0"></script>
<script type="text/javascript" src="dbloader.js?v=4.0"></script>
<script type="text/javascript" src="registrations.js?v=4.0"></script>
<script type="text/javascript" src="planeObject.js?v=4.0"></script>
<script type="text/javascript" src="formatter.js?v=2?v=4.0"></script>
<script type="text/javascript" src="flags.js?v=4.0"></script>
<script type="text/javascript" src="layers.js?v=4.0"></script>
<script type="text/javascript" src="script.js?v=4.0"></script>
<script type="text/javascript" src="config.js?v=5.0"></script>
<script type="text/javascript" src=5"markers.js?v=5.0"></script>
<script type="text/javascript" src="dbloader.js?v=5.0"></script>
<script type="text/javascript" src="registrations.js?v=5.0"></script>
<script type="text/javascript" src="planeObject.js?v=5.0"></script>
<script type="text/javascript" src="formatter.js?v=2?v=5.0"></script>
<script type="text/javascript" src="flags.js?v=5.0"></script>
<script type="text/javascript" src="layers.js?v=5.0"></script>
<script type="text/javascript" src="script.js?v=5.0"></script>
<title>PiAware SkyAware</title>
</head>