Merge branch 'master' into matdev

2017-08-31 12:46:48 +02:00
parent 4de36adce7 40874d1b27
commit 1803e604c4
16 changed files with 918 additions and 1224 deletions
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
    "css-loader": "^0.28.5",
    "eslint": "^4.5.0",
    "eslint-loader": "^1.9.0",
-    "eslint-plugin-html": "^3.2.0",
+    "eslint-plugin-vue": "^3.12.0",
    "less": "^2.7.2",
    "less-loader": "^4.0.5",
    "vue-hot-reload-api": "^2.1.0",