Skip to content

Commit

Permalink
Merge branch 'dev' of github.com:didi/cube-ui into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
dolymood committed Nov 27, 2019
2 parents 379babf + 78798c4 commit 1b3d3b6
Show file tree
Hide file tree
Showing 3 changed files with 381 additions and 177 deletions.
175 changes: 118 additions & 57 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@
"vue-style-loader": "^3.0.1",
"vue-template-compiler": "^2.5.13",
"webpack": "^3.12.0",
"webpack-bundle-analyzer": "^2.2.1",
"webpack-bundle-analyzer": "^3.3.2",
"webpack-dev-middleware": "^1.10.0",
"webpack-hot-middleware": "^2.18.0",
"webpack-merge": "^4.1.0"
Expand Down
Loading

0 comments on commit 1b3d3b6

Please sign in to comment.