Skip to content

Commit

Permalink
Merge branch 'develop' into fix/fix-dojo-build-issues
Browse files Browse the repository at this point in the history
  • Loading branch information
green3g authored Jun 17, 2016
2 parents 0e5224f + 2bfe000 commit 088b9c9
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions viewer/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<meta name="author" content="cmv.io">
<link rel="shortcut icon" href="./favicon.png">
<title>Configurable Map Viewer</title>
<link rel="stylesheet" type="text/css" href="//js.arcgis.com/3.16compact/esri/css/esri.css">
<link rel="stylesheet" type="text/css" href="//js.arcgis.com/3.17compact/esri/css/esri.css">
<link rel="stylesheet" type="text/css" href="//maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css">
<link rel="stylesheet" type="text/css" href="css/theme/dbootstrap/dbootstrap.css">
<link rel="stylesheet" type="text/css" href="css/main.css">
Expand Down Expand Up @@ -41,7 +41,7 @@
<!--[if lt IE 9]>
<script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/es5-shim/4.0.3/es5-shim.min.js"></script>
<![endif]-->
<script src="//js.arcgis.com/3.16compact/"></script>
<script src="//js.arcgis.com/3.17compact/"></script>
<script src="js/config/app.js"></script>
</body>
</html>

0 comments on commit 088b9c9

Please sign in to comment.