Authored by htoooth

Merge remote-tracking branch 'origin/release/2.0' into release/2.0

... ... @@ -131,7 +131,7 @@ body {
.layout-copy {
text-align: center;
padding: 10px 0 20px;
padding: 5px;
color: #9ea7b4;
}
}
... ...
... ... @@ -51,7 +51,6 @@
"connect-multiparty": "^2.0.0",
"cookie-parser": "^1.4.3",
"cookie-session": "^2.0.0-beta.1",
"cryptico": "^1.0.2",
"crypto-js": "^3.1.9-1",
"excel-export": "^0.5.1",
"express": "^4.15.2",
... ... @@ -73,7 +72,6 @@
"vue-template-compiler": "^2.3.4",
"xlsx2json": "^1.0.0",
"yoho-cookie": "^1.2.0",
"yoho-md5": "^2.0.0",
"yoho-node-lib": "^0.2.18",
"yoho-store": "^1.3.20"
},
... ...