Merge branch 'development'

missioncommand · Nov 15, 2017 · 375ba87 · 375ba87
2 parents 7a4d2c8 + 8a6415e
commit 375ba87
Show file tree

Hide file tree

Showing 54 changed files with 170,061 additions and 106,342 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,12 @@
 {
   "name": "emp3-web-sdk",
   "version": "2.6.0",
-  "keywords": ["extensible", "map", "mapping", "platform"],
+  "keywords": [
+    "extensible",
+    "map",
+    "mapping",
+    "platform"
+  ],
   "description": "A library for embedding and manipulationg maps in web applications.",
   "bugs": {
     "url": "https://github.com/missioncommand/emp3-web/issues"
@@ -33,6 +38,7 @@
     "grunt": "^0.4.5",
     "grunt-concurrent": "^2.3.1",
     "grunt-contrib-compress": "^1.3.0",
+    "grunt-contrib-concat": "^1.0.1",
     "grunt-contrib-copy": "",
     "grunt-contrib-cssmin": "",
     "grunt-contrib-jshint": "^0.10.0",