Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
abought committed Feb 28, 2022
2 parents 4849e78 + 9d46a6b commit c781107
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 26 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ For production deployment instructions, see [docs/deploy/index.md](docs/deploy/i

- In one tab, build assets (in local development, this is currently done on the host system, outside of Docker):

`$ yarn run prod`
`$ npm run prod`

or with live rebuilding, if you intend to be changing JS code as you work:

`$ yarn run dev`
`$ npm run dev`

- In a second open terminal::

Expand Down
57 changes: 35 additions & 22 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

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": "^5.16.0",
"d3-tip": "0.9.1",
"gwas-credible-sets": "^0.1.0",
"localzoom": "git+https://github.com/statgen/localzoom.git#e6df08d",
"locuszoom": "git+https://github.com/statgen/locuszoom.git#33316cd",
"localzoom": "git+https://github.com/statgen/localzoom.git#eb10524",
"locuszoom": "git+https://github.com/statgen/locuszoom.git#674d25c",
"lodash": "^4.17.21",
"pako": "^1.0.11",
"tabulator-tables": "^4.9.3",
Expand Down

0 comments on commit c781107

Please sign in to comment.