Skip to content

Commit

Permalink
Merge branch 'release/0.1.13'
Browse files Browse the repository at this point in the history
  • Loading branch information
abought committed Jul 31, 2020
2 parents 3cd1d34 + 6d07122 commit 2b933f1
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
"d3": "3.5.16",
"d3-tip": "0.9.0",
"gwas-credible-sets": "^0.1.0",
"localzoom": "https://github.com/statgen/localzoom#3464825",
"locuszoom": "0.12.0-beta.2",
"localzoom": "https://github.com/statgen/localzoom#4bede3f",
"locuszoom": "0.12.0-beta.3",
"pako": "^1.0.8",
"underscore": "1.8.3",
"vue": "^2.6.10",
Expand Down
18 changes: 9 additions & 9 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3551,7 +3551,7 @@ jsprim@^1.2.2:
json-schema "0.2.3"
verror "1.10.0"

"jszlib@github:dasmoth/jszlib":
jszlib@dasmoth/jszlib:
version "0.2.1"
resolved "https://codeload.github.com/dasmoth/jszlib/tar.gz/4e562c7b88749f3e1e402737ddef5f96bf0906c6"

Expand Down Expand Up @@ -3631,15 +3631,15 @@ loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2
emojis-list "^3.0.0"
json5 "^1.0.1"

"localzoom@https://github.com/statgen/localzoom#3464825":
version "0.6.0"
resolved "https://github.com/statgen/localzoom#34648256205ec7b253245153849d0d5b7fbd13e3"
"localzoom@https://github.com/statgen/localzoom#4bede3f":
version "0.6.1"
resolved "https://github.com/statgen/localzoom#4bede3f6a326468d898fd4803255c1e9702388e2"
dependencies:
"@sentry/browser" "^4.5.2"
bootstrap "^4.4.1"
bootstrap-vue "^2.0.0-rc.11"
gwas-credible-sets "^0.1.0"
locuszoom "0.12.0-beta.2"
locuszoom "0.12.0-beta.3"
lodash "^4.17.11"
tabix-reader "^1.0.0"
tabulator-tables "^4.1.4"
Expand All @@ -3654,10 +3654,10 @@ locate-path@^3.0.0:
p-locate "^3.0.0"
path-exists "^3.0.0"

[email protected].2:
version "0.12.0-beta.2"
resolved "https://registry.yarnpkg.com/locuszoom/-/locuszoom-0.12.0-beta.2.tgz#27c28bee251abf3a54ff1d0176486fe7cd5c2b4c"
integrity sha512-bIikuYjCaHEDiG5Ni/cJq/DoyLfjU5VklH+dmCF9OpbVsUqa8pjyDRRFUK/N6u+QY02V9H9byrsTFO+6mZntiQ==
[email protected].3:
version "0.12.0-beta.3"
resolved "https://registry.yarnpkg.com/locuszoom/-/locuszoom-0.12.0-beta.3.tgz#d1aedf3dbe9f125256b22f0e0220953ac79f2a29"
integrity sha512-U+NQaRZUHSOPlh4st4dfhkP9Q9wtZzjaECTD5OAGCQ+ceiwILn922iALKHib9hkmGhHqg/21vWtJESnSlVHrag==
dependencies:
d3 "^5.16.0"

Expand Down

0 comments on commit 2b933f1

Please sign in to comment.