Skip to content

Commit

Permalink
Merge branch 'release/0.1.17'
Browse files Browse the repository at this point in the history
  • Loading branch information
abought committed Aug 18, 2020
2 parents d254bf9 + a294b92 commit df11dcd
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 9 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#756b9dc",
"locuszoom": "0.12.0",
"localzoom": "https://github.com/statgen/localzoom#85aab17",
"locuszoom": "https://github.com/statgen/locuszoom#98f7eae",
"pako": "^1.0.8",
"underscore": "1.8.3",
"vue": "^2.6.10",
Expand Down
13 changes: 6 additions & 7 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#756b9dc":
version "0.6.4"
resolved "https://github.com/statgen/localzoom#756b9dc4df2de0073e19d1074871a84219325999"
"localzoom@https://github.com/statgen/localzoom#85aab17":
version "0.6.5"
resolved "https://github.com/statgen/localzoom#85aab173683586d8d02f4f4663faf224f9c849f2"
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"
locuszoom "https://github.com/statgen/locuszoom#98f7eae"
lodash "^4.17.11"
tabix-reader "^1.0.0"
tabulator-tables "^4.1.4"
Expand All @@ -3654,10 +3654,9 @@ locate-path@^3.0.0:
p-locate "^3.0.0"
path-exists "^3.0.0"

locuszoom@0.12.0:
"locuszoom@https://github.com/statgen/locuszoom#98f7eae":
version "0.12.0"
resolved "https://registry.yarnpkg.com/locuszoom/-/locuszoom-0.12.0.tgz#9e2efb255bcf2ab5f64306e95674142e8677b2b2"
integrity sha512-56CjgXEzNIBHHnOzULzjZ0KWQ0hO7oHotFKtL1c8ad1r1vYuM1o+P+W0J+bmuXdr5Fh28ph9oEhwSyEuMBZFFw==
resolved "https://github.com/statgen/locuszoom#98f7eae9d51ee81d0fe47ac7f7407a79e90837b0"
dependencies:
d3 "^5.16.0"

Expand Down

0 comments on commit df11dcd

Please sign in to comment.