Merge branch 'develop' into travis/room-list-2

2020-05-18 23:23:59 -06:00
parent 21e471375e 9aff2e836e
commit 38920e7f30
29 changed files with 645 additions and 325 deletions
--- a/package.json
+++ b/package.json
@@ -122,6 +122,7 @@
    "@types/modernizr": "^3.5.3",
    "@types/qrcode": "^1.3.4",
    "@types/react": "16.9",
+    "@types/zxcvbn": "^4.4.0",
    "babel-eslint": "^10.0.3",
    "babel-jest": "^24.9.0",
    "chokidar": "^3.3.1",