Merge remote-tracking branch 'pan/master'

This commit is contained in:
James ZHANG
2018-04-25 11:52:38 +08:00
21 changed files with 189 additions and 78 deletions

View File

@@ -1,6 +1,6 @@
{
"name": "vue-element-admin",
"version": "3.6.4",
"version": "3.6.5",
"description": "A magical vue admin. Typical templates for enterprise applications. Newest development stack of vue. Lots of awesome features",
"author": "Pan <panfree23@gmail.com>",
"license": "MIT",
@@ -18,7 +18,7 @@
"codemirror": "5.32.0",
"dropzone": "5.2.0",
"echarts": "3.8.5",
"element-ui": "2.0.8",
"element-ui": "2.3.2",
"file-saver": "1.3.3",
"font-awesome": "4.7.0",
"js-cookie": "2.2.0",