Skip to content

Commit

Permalink
Merge branch 'feature/fixes-ci-build-times' of https://github.com/Cit…
Browse files Browse the repository at this point in the history
…yOfZion/neon-wallet into feature/fixes-ci-build-times
  • Loading branch information
comountainclimber committed Dec 17, 2018
2 parents 9a6ae83 + 54dc231 commit ed2a1eb
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 11 deletions.
3 changes: 2 additions & 1 deletion README.md
Expand Up @@ -40,10 +40,11 @@
- Switch networks (Test/Main)
- nep9 QR support
- Participate in NEO token sales
- View wallet activity

## Installation

Standalone apps can be found [here](https://neonwallet.com/), to build manually see the steps below.
The latest release binaries can be found [here](https://neonwallet.com/), to build manually see the steps below.

### Required Tools and Dependencies

Expand Down
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -78,7 +78,7 @@
"classnames": "2.2.5",
"cleave.js": "1.0.7",
"compare-versions": "3.1.0",
"coveralls": "3.0.0",
"coveralls": "3.0.2",
"electron-context-menu": "0.9.1",
"electron-json-storage": "4.1.0",
"electron-save-file": "1.0.2",
Expand Down
23 changes: 14 additions & 9 deletions yarn.lock
Expand Up @@ -3316,15 +3316,16 @@ cosmiconfig@^5.0.5:
js-yaml "^3.9.0"
parse-json "^4.0.0"

coveralls@3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/coveralls/-/coveralls-3.0.0.tgz#22ef730330538080d29b8c151dc9146afde88a99"
coveralls@3.0.2:
version "3.0.2"
resolved "https://registry.yarnpkg.com/coveralls/-/coveralls-3.0.2.tgz#f5a0bcd90ca4e64e088b710fa8dda640aea4884f"
dependencies:
js-yaml "^3.6.1"
growl "~> 1.10.0"
js-yaml "^3.11.0"
lcov-parse "^0.0.10"
log-driver "^1.2.5"
log-driver "^1.2.7"
minimist "^1.2.0"
request "^2.79.0"
request "^2.85.0"

crc32-stream@^2.0.0:
version "2.0.0"
Expand Down Expand Up @@ -5790,6 +5791,10 @@ grapheme-splitter@^1.0.2:
version "1.0.4"
resolved "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e"

"growl@~> 1.10.0":
version "1.10.5"
resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e"

growly@^1.3.0:
version "1.3.0"
resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
Expand Down Expand Up @@ -7088,7 +7093,7 @@ js-tokens@^3.0.0, js-tokens@^3.0.2:
version "4.0.0"
resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"

js-yaml@^3.12.0, js-yaml@^3.6.1, js-yaml@^3.7.0, js-yaml@^3.8.2, js-yaml@^3.9.0, js-yaml@^3.9.1:
js-yaml@^3.11.0, js-yaml@^3.12.0, js-yaml@^3.7.0, js-yaml@^3.8.2, js-yaml@^3.9.0, js-yaml@^3.9.1:
version "3.12.0"
resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.0.tgz#eaed656ec8344f10f527c6bfa1b6e2244de167d1"
dependencies:
Expand Down Expand Up @@ -7567,7 +7572,7 @@ lodash@^4.0.0, lodash@^4.0.1, lodash@^4.13.1, lodash@^4.15.0, lodash@^4.16.2, lo
version "4.17.11"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"

log-driver@^1.2.5:
log-driver@^1.2.7:
version "1.2.7"
resolved "https://registry.yarnpkg.com/log-driver/-/log-driver-1.2.7.tgz#63b95021f0702fedfa2c9bb0a24e7797d71871d8"

Expand Down Expand Up @@ -10278,7 +10283,7 @@ request-promise-native@^1.0.5:
stealthy-require "^1.1.0"
tough-cookie ">=2.3.3"

request@^2.45.0, request@^2.79.0, request@^2.81.0, request@^2.83.0, request@^2.87.0:
request@^2.45.0, request@^2.79.0, request@^2.81.0, request@^2.83.0, request@^2.85.0, request@^2.87.0:
version "2.88.0"
resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
dependencies:
Expand Down

0 comments on commit ed2a1eb

Please sign in to comment.