Authored by 郭成尧

Merge branch 'develop' of git.yoho.cn:fe/yohoblk-wap into develop

... ... @@ -28,7 +28,7 @@
"express-handlebars": "^3.0.0",
"express-session": "^1.14.0",
"influxdb-winston": "^1.0.1",
"lodash": "^4.14.2",
"lodash": "^4.15.0",
"memcached": "^2.2.1",
"moment": "^2.14.1",
"morgan": "^1.7.0",
... ... @@ -39,7 +39,7 @@
"winston": "^2.2.0",
"winston-daily-rotate-file": "^1.1.4",
"yoho-md5": "^2.0.0",
"yoho-node-lib": "0.0.38"
"yoho-node-lib": "0.0.40"
},
"devDependencies": {
"autoprefixer": "^6.4.0",
... ... @@ -48,7 +48,7 @@
"babel-plugin-transform-runtime": "^6.12.0",
"babel-preset-es2015": "^6.13.2",
"babel-runtime": "^6.11.6",
"eslint": "^3.2.2",
"eslint": "^3.3.0",
"eslint-config-yoho": "^1.0.1",
"eslint-plugin-html": "^1.5.2",
"extract-text-webpack-plugin": "^1.0.1",
... ... @@ -82,7 +82,7 @@
"stylelint-processor-html": "^1.0.0",
"vue": "1.0.26",
"vue-infinite-scroll": "0.2.3",
"vue-lazyload": "^0.4.5",
"vue-lazyload": "^0.4.6",
"vue-loader": "^8.5.3",
"vue-swipe": "0.2.6",
"vue-touch": "1.1.0",
... ...