Skip to content
This repository has been archived by the owner on Sep 30, 2021. It is now read-only.

Commit

Permalink
Merge pull request #21 from ellcrys/dev
Browse files Browse the repository at this point in the history
Bumped JQuery Version
  • Loading branch information
ncodes authored May 4, 2019
2 parents 4b20287 + 3c6869a commit 30b70c2
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 11 deletions.
8 changes: 4 additions & 4 deletions package-lock.json

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

10 changes: 7 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@
"dist/electron/**/*"
],
"dmg": {
"contents": [{
"contents": [
{
"x": 410,
"y": 150,
"type": "link",
Expand All @@ -54,7 +55,10 @@
},
"win": {
"icon": "build/icons/icon.ico",
"target": ["nsis", "msi"]
"target": [
"nsis",
"msi"
]
},
"linux": {
"icon": "build/icons",
Expand Down Expand Up @@ -98,7 +102,7 @@
"electron-timber": "^0.5.1",
"es6-promise": "^4.2.6",
"humanize-duration": "^3.18.0",
"jquery": "^3.3.1",
"jquery": "3.4.0",
"js-hashrate-parser": "0.0.6",
"lodash": "^4.17.11",
"mkdirp": "^0.5.1",
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5990,10 +5990,10 @@ javascript-natural-sort@0.7.1:
resolved "https://registry.yarnpkg.com/javascript-natural-sort/-/javascript-natural-sort-0.7.1.tgz#f9e2303d4507f6d74355a73664d1440fb5a0ef59"
integrity sha1-+eIwPUUH9tdDVac2ZNFED7Wg71k=

jquery@^3.3.1:
version "3.3.1"
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.3.1.tgz#958ce29e81c9790f31be7792df5d4d95fc57fbca"
integrity sha512-Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg==
jquery@3.4.0:
version "3.4.0"
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.4.0.tgz#8de513fa0fa4b2c7d2e48a530e26f0596936efdf"
integrity sha512-ggRCXln9zEqv6OqAGXFEcshF5dSBvCkzj6Gm2gzuR5fWawaX8t7cxKVkkygKODrDAzKdoYw3l/e3pm3vlT4IbQ==

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

0 comments on commit 30b70c2

Please sign in to comment.