Merge remote-tracking branch 'origin/master'

etl12003 · Mar 29, 2017 · 8049609 · 8049609
2 parents 70fe3b6 + 305252e
commit 8049609
Show file tree

Hide file tree

Showing 8 changed files with 419 additions and 1,032 deletions.
diff --git a/Wello/platforms/browser/cordova/build b/Wello/platforms/browser/cordova/build
diff --git a/Wello/platforms/browser/cordova/clean b/Wello/platforms/browser/cordova/clean
diff --git a/...node_modules/cordova-serve/node_modules/express/node_modules/content-disposition/index.js b/...node_modules/cordova-serve/node_modules/express/node_modules/content-disposition/index.js
diff --git a/...wser/cordova/node_modules/cordova-serve/node_modules/express/node_modules/cookie/index.js b/...wser/cordova/node_modules/cordova-serve/node_modules/express/node_modules/cookie/index.js
diff --git a/Wello/platforms/browser/cordova/run b/Wello/platforms/browser/cordova/run
diff --git a/Wello/platforms/browser/cordova/version b/Wello/platforms/browser/cordova/version
diff --git a/html-ONLY-site/map.php b/html-ONLY-site/map.php
@@ -1,5 +1,3 @@
-
-
 <!DOCTYPE html>
 <html class="no-js" lang="">
 
@@ -18,22 +16,12 @@
     <script src="js/vendor/modernizr-2.8.3.min.js"></script>
 </head>
 
-
-
-
-
-
 <body>
     <!--[if lt IE 8]>
             <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
         <![endif]-->
     <!-- Add your site or application content here -->
 
-
-
-
-
-
     <nav class="top-nav">
         <div class="main-bttns">
         <button onclick="document.getElementById('menu').classList.toggle('closed'); document.getElementById('close-menu').classList.toggle('closed')"><img src="img/menu.svg" alt="menu" /></button> <h1>Well Report App</h1>