Skip to content

Commit

Permalink
Merge branch 'release/0.6.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
abought committed Jul 31, 2020
2 parents 3464825 + e0ee466 commit 4bede3f
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "localzoom",
"version": "0.6.0",
"version": "0.6.1",
"license": "MIT",
"scripts": {
"serve": "vue-cli-service serve",
Expand All @@ -14,7 +14,7 @@
"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 Down
10 changes: 5 additions & 5 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5705,7 +5705,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 @@ -5849,10 +5849,10 @@ locate-path@^5.0.0:
dependencies:
p-locate "^4.1.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 4bede3f

Please sign in to comment.