Skip to content

Commit

Permalink
Merge branch '7.x' into backport/7.x/pr-78221
Browse files Browse the repository at this point in the history
  • Loading branch information
elasticmachine authored Sep 29, 2020
2 parents f3357b8 + 63cfbdb commit 312cf73
Show file tree
Hide file tree
Showing 114 changed files with 2,634 additions and 2,844 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@
"boom": "^7.2.0",
"chalk": "^2.4.2",
"check-disk-space": "^2.1.0",
"chokidar": "3.2.1",
"chokidar": "^3.4.2",
"color": "1.0.3",
"commander": "^3.0.2",
"core-js": "^3.6.4",
Expand Down Expand Up @@ -346,7 +346,7 @@
"angular-route": "^1.8.0",
"angular-sortable-view": "^0.0.17",
"archiver": "^3.1.1",
"axe-core": "^3.4.1",
"axe-core": "^4.0.2",
"babel-eslint": "^10.0.3",
"babel-jest": "^25.5.1",
"babel-plugin-istanbul": "^6.0.0",
Expand Down
Loading

0 comments on commit 312cf73

Please sign in to comment.