Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/npm_and_yarn/typescript-3.7.5
Browse files Browse the repository at this point in the history
  • Loading branch information
Rotendahl committed Feb 4, 2020
2 parents 6e0c130 + 7cd1e50 commit 2555b5f
Show file tree
Hide file tree
Showing 2 changed files with 88 additions and 52 deletions.
138 changes: 87 additions & 51 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"cypress": "^3.8.3",
"dawa-autocomplete2": "^1.0.2",
"jquery": "^3.4.1",
"npm": "^6.13.4",
"npm": "^6.13.7",
"react": "^16.12.0",
"react-dom": "^16.12.0",
"react-responsive-modal": "^4.0.1",
Expand Down

0 comments on commit 2555b5f

Please sign in to comment.