Merge remote-tracking branch 'origin/dev' into dev

# Conflicts: # yarn.lock
2021-03-26 17:09:30 -07:00
parent 69b86a2b9d 555c9213f4
commit f9bf6aff2e
4 changed files with 4 additions and 6 deletions
--- a/package.json
+++ b/package.json
@@ -64,6 +64,7 @@
    "classnames": "^2.2.6",
    "cookie": "^0.4.1",
    "cors": "^2.8.5",
+    "datamaps": "^0.5.9",
    "date-fns": "^2.16.1",
    "date-fns-tz": "^1.0.12",
    "detect-browser": "^5.2.0",