Merge from master

This commit is contained in:
Dolan
2018-08-21 20:59:20 +01:00
24 changed files with 389 additions and 52 deletions

View File

@ -68,7 +68,7 @@
"chai": "^3.5.0",
"glob": "^7.1.2",
"jszip": "^3.1.5",
"mocha": "^3.2.0",
"mocha": "^5.2.0",
"mocha-webpack": "^1.0.1",
"pre-commit": "^1.2.2",
"prettier": "^1.12.1",