Skip to content

Commit

Permalink
Merge pull request #493 from AugurProject/petong/stable-merge-2018070…
Browse files Browse the repository at this point in the history
…60026

Petong/stable merge 201807060026
  • Loading branch information
pgebheim committed Jul 6, 2018
2 parents 78c0e76 + 4b71477 commit 7c22fd1
Show file tree
Hide file tree
Showing 31 changed files with 476 additions and 117 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Expand Up @@ -3,5 +3,5 @@ node_modules/
coverage/
build/
definitions/
augur.db
augur*.db
tags
208 changes: 178 additions & 30 deletions package-lock.json

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

0 comments on commit 7c22fd1

Please sign in to comment.