Skip to content

Commit

Permalink
Merge pull request #1 from iwillhappy1314/dependabot/npm_and_yarn/jqu…
Browse files Browse the repository at this point in the history
…ery-3.4.0

Bump jquery from 3.3.1 to 3.4.0
  • Loading branch information
iwillhappy1314 committed Jun 5, 2019
2 parents 7aaa657 + 83c8164 commit 1bda378
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 25 deletions.
55 changes: 37 additions & 18 deletions package-lock.json
100755 → 100644

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
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
},
"dependencies": {
"bootstrap": "^4.3.1",
"jquery": "^3.3.1",
"jquery": "^3.4.0",
"popper.js": "^1.14.3"
}
}
12 changes: 6 additions & 6 deletions yarn.lock
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -566,9 +566,9 @@ boom@5.x.x:
dependencies:
hoek "4.x.x"

bootstrap@v4.1.1:
version "4.1.1"
resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.1.1.tgz#3aec85000fa619085da8d2e4983dfd67cf2114cb"
bootstrap@^4.3.1:
version "4.3.1"
resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.3.1.tgz#280ca8f610504d99d7b6b4bfc4b68cec601704ac"

brace-expansion@^1.1.7:
version "1.1.11"
Expand Down Expand Up @@ -4185,9 +4185,9 @@ jpegtran-bin@^3.0.0:
bin-wrapper "^3.0.0"
logalot "^2.0.0"

jquery@^3.3.1:
version "3.3.1"
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.3.1.tgz#958ce29e81c9790f31be7792df5d4d95fc57fbca"
jquery@^3.4.0:
version "3.4.0"
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.4.0.tgz#8de513fa0fa4b2c7d2e48a530e26f0596936efdf"

js-base64@^2.1.8, js-base64@^2.1.9:
version "2.4.3"
Expand Down

0 comments on commit 1bda378

Please sign in to comment.