Merge branch 'master' of https://github.com/bdeanindy/vuestic-admin i…

…nto bdeanindy-master
sahibhuseyn · Aug 8, 2017 · e56b34e · e56b34e
2 parents 82add54 + a4e98f9
commit e56b34e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,4 @@ node_modules/
 dist/
 npm-debug.log
 .idea/
+package-lock.json
diff --git a/package.json b/package.json
@@ -28,7 +28,7 @@
     "vee-validate": "2.0.0-rc.7",
     "vue": "^2.3.0",
     "vue-bulma-expanding": "0.0.0",
-    "vue-chartjs": "^2.7.1",
+    "vue-chartjs": "^2.8.1",
     "vue-router": "^2.2.0",
     "vue-slider-component": "^2.3.3",
     "vue2-circle-progress": "^1.0.3",
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,3 +3,4 @@ node_modules/ @@
     dist/
     npm-debug.log
     .idea/
+    package-lock.json