Skip to content

Commit

Permalink
Merge branch 'dev' into staging
Browse files Browse the repository at this point in the history
  • Loading branch information
mutability committed Sep 11, 2019
2 parents ae4a89b + 25b3a34 commit 089684e
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions public_html/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html>
<head>
<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" />
<script src="jquery/jquery-3.0.0.min.js"></script>
<script src="jquery/jquery-ui-1.11.4.min.js"></script>
Expand All @@ -14,15 +14,15 @@
<link rel="stylesheet" href="ol/ol3-layerswitcher.css" type="text/css"/>
<script src="ol/ol3-layerswitcher.js" type="text/javascript"></script>

<script type="text/javascript" src="config.js"></script>
<script type="text/javascript" src="markers.js"></script>
<script type="text/javascript" src="dbloader.js"></script>
<script type="text/javascript" src="registrations.js"></script>
<script type="text/javascript" src="planeObject.js?v=2"></script>
<script type="text/javascript" src="formatter.js?v=2"></script>
<script type="text/javascript" src="flags.js"></script>
<script type="text/javascript" src="layers.js"></script>
<script type="text/javascript" src="script.js?v=2"></script>
<script type="text/javascript" src="config.js?v=3.7.2"></script>
<script type="text/javascript" src="markers.js?v=3.7.2"></script>
<script type="text/javascript" src="dbloader.js?v=3.7.2"></script>
<script type="text/javascript" src="registrations.js?v=3.7.2"></script>
<script type="text/javascript" src="planeObject.js?v=3.7.2"></script>
<script type="text/javascript" src="formatter.js?v=2?v=3.7.2"></script>
<script type="text/javascript" src="flags.js?v=3.7.2"></script>
<script type="text/javascript" src="layers.js?v=3.7.2"></script>
<script type="text/javascript" src="script.js?v=3.7.2"></script>
<title>PiAware SkyAware</title>
</head>

Expand Down

0 comments on commit 089684e

Please sign in to comment.