Skip to content

Commit

Permalink
Merge branch '4.0-dev' into patch-110
Browse files Browse the repository at this point in the history
  • Loading branch information
wilsonge authored Feb 28, 2019
2 parents 7c46dc2 + a5e17b8 commit 92fcc6d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 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 @@ -25,7 +25,7 @@
"@claviska/jquery-minicolors": "2.2.6",
"@webcomponents/webcomponentsjs": "2.1.2",
"awesomplete": "github:LeaVerou/awesomplete",
"bootstrap": "4.1.3",
"bootstrap": "~4.3",
"choices.js": "^3.0.4",
"chosen-js": "1.6.2",
"codemirror": "5.38.0",
Expand Down

0 comments on commit 92fcc6d

Please sign in to comment.