Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
1ec995779f
2 changed files with 6552 additions and 1 deletions
6551
package-lock.json
generated
Normal file
6551
package-lock.json
generated
Normal file
File diff suppressed because it is too large
Load diff
|
@ -121,7 +121,7 @@
|
|||
"karma-webpack": "^1.7.0",
|
||||
"matrix-react-test-utils": "^0.1.1",
|
||||
"mocha": "^2.4.5",
|
||||
"parallelshell": "^1.2.0",
|
||||
"parallelshell": "^3.0.2",
|
||||
"react-addons-test-utils": "^15.4.0",
|
||||
"require-json": "0.0.1",
|
||||
"rimraf": "^2.4.3",
|
||||
|
|
Loading…
Reference in a new issue