Merge branch 'master' into release

This commit is contained in:
Jay 2018-08-26 18:11:54 +08:00
commit 57d2b171c2

View File

@ -16,7 +16,7 @@
"axios": "^0.18.0", "axios": "^0.18.0",
"bcrypt": "^3.0.0", "bcrypt": "^3.0.0",
"cheerio": "^1.0.0-rc.2", "cheerio": "^1.0.0-rc.2",
"cron": "^1.3.0", "cron": "1.3.0",
"dotenv": "^6.0.0", "dotenv": "^6.0.0",
"gm": "^1.23.1", "gm": "^1.23.1",
"ioredis": "^3.2.2", "ioredis": "^3.2.2",