Merge branch 'develop' into fix/remove-resource-proxy

cmv · Jun 19, 2016 · 3451106 · 3451106
2 parents b9a98a9 + 2bfe000
commit 3451106
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/viewer/index.html b/viewer/index.html
@@ -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">
@@ -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>
diff --git a/viewer/js/config/app.js b/viewer/js/config/app.js
@@ -19,7 +19,7 @@
             }, {
                 name: 'xstyle',
                 main: 'css',
-                location: 'https://cdn.rawgit.com/kriszyp/xstyle/master'
+                location: 'https://cdn.rawgit.com/kriszyp/xstyle/v0.3.2'
             }
         ]
     };