Merge branch '2.2' into develop

This commit is contained in:
Markus Mäkelä
2018-06-11 11:28:36 +03:00
7 changed files with 871 additions and 603 deletions

1336
maxctrl/package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -27,8 +27,8 @@
"devDependencies": {
"chai": "^3.5.0",
"chai-as-promised": "^6.0.0",
"mocha": "^3.3.0",
"nyc": "^11.0.3",
"mocha": "^3.5.3",
"nyc": "^11.9.0",
"strip-ansi": "^4.0.0"
},
"nyc": {