Skip to content

Commit

Permalink
Merge branch 'release/0.1.14'
Browse files Browse the repository at this point in the history
  • Loading branch information
abought committed Aug 6, 2020
2 parents 2b933f1 + 87e196e commit 7151419
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 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#4bede3f",
"locuszoom": "0.12.0-beta.3",
"localzoom": "https://github.com/statgen/localzoom#64c1b13",
"locuszoom": "0.12.0-beta.4",
"pako": "^1.0.8",
"underscore": "1.8.3",
"vue": "^2.6.10",
Expand Down
16 changes: 8 additions & 8 deletions yarn.lock
Original file line number Diff line number Diff line change
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#4bede3f":
version "0.6.1"
resolved "https://github.com/statgen/localzoom#4bede3f6a326468d898fd4803255c1e9702388e2"
"localzoom@https://github.com/statgen/localzoom#64c1b13":
version "0.6.2"
resolved "https://github.com/statgen/localzoom#64c1b1328e089ff0afb9efcd6bb27d3bdddec3e5"
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.3"
locuszoom "0.12.0-beta.4"
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].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==
[email protected].4:
version "0.12.0-beta.4"
resolved "https://registry.yarnpkg.com/locuszoom/-/locuszoom-0.12.0-beta.4.tgz#640501c40f2981d00b2386057b2a18d2787c3f42"
integrity sha512-tsX2vIu6KLCfi338duaE8dpiSRgl1S9mruugOPhK/HFQ5skpQLagWZKY9VLVNMCS+1zu3dkWPxHA2kKx/c10Kg==
dependencies:
d3 "^5.16.0"

Expand Down

0 comments on commit 7151419

Please sign in to comment.