Merge branch 'develop'

vasttian · Aug 29, 2019 · 91ee044 · 91ee044
2 parents 304a6fe + ab1a45b
commit 91ee044
Show file tree

Hide file tree

Showing 7 changed files with 410 additions and 15 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -59,7 +59,8 @@
     "vue-router": "^3.0.6",
     "vuedraggable": "^2.21.0",
     "vuetify": "^1.5.16",
-    "vuex": "^3.1.1"
+    "vuex": "^3.1.1",
+    "xlsx": "^0.15.1"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "^3.8.0",