Skip to content

Commit

Permalink
Merge branch 'master' into snyk-upgrade-31b21bc445140535c2ee7f90d554bb2b
Browse files Browse the repository at this point in the history
  • Loading branch information
ericblade committed Apr 24, 2020
2 parents 9c69c2d + 6e12159 commit 93242bc
Show file tree
Hide file tree
Showing 2 changed files with 176 additions and 37 deletions.
209 changes: 174 additions & 35 deletions example/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 example/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
"dependencies": {
"@ericblade/quagga2": "^0.0.19",
"@ericblade/quagga2-reader-qr": "git+https://github.com/ericblade/quagga2-reader-qr.git",
"@testing-library/jest-dom": "^5.1.1",
"@testing-library/jest-dom": "^5.3.0",
"@testing-library/react": "^10.0.2",
"@testing-library/user-event": "^10.0.0",
"@testing-library/user-event": "^10.0.1",
"react": "^16.13.0",
"react-dom": "^16.13.0",
"react-scripts": "3.4.1"
Expand Down

0 comments on commit 93242bc

Please sign in to comment.