Merge branch 'develop' into lint

This commit is contained in:
Travis Ralston 2018-10-26 19:56:33 -06:00
commit 70891f41a5
3 changed files with 2463 additions and 3432 deletions

View file

@ -125,6 +125,7 @@
"karma-webpack": "4.0.0-beta.0",
"matrix-mock-request": "^1.2.0",
"matrix-react-test-utils": "^0.2.0",
"memfs": "^2.10.1",
"minimist": "^1.2.0",
"mkdirp": "^0.5.1",
"mocha": "^5.2.0",