Merge branch 'database' into databasen

package-lock.json

@@ -46,9 +46,9 @@
       "integrity": "sha512-rouEWBImiRaSJsVA+ITTFM6ZxibuAlTuNOCyxVbwreu6k6+ujs7DfnU9o+PShFhET78pMBl3eH+AGSI5eOTkPA=="
     },
     "@types/underscore": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/@types/underscore/-/underscore-1.10.0.tgz",
-      "integrity": "sha512-ZAbqul7QAKpM2h1PFGa5ETN27ulmqtj0QviYHasw9LffvXZvVHuraOx/FOsIPPDNGZN0Qo1nASxxSfMYOtSoCw=="
+      "version": "1.10.24",
+      "resolved": "https://registry.npmjs.org/@types/underscore/-/underscore-1.10.24.tgz",
+      "integrity": "sha512-T3NQD8hXNW2sRsSbLNjF/aBo18MyJlbw0lSpQHB/eZZtScPdexN4HSa8cByYwTw9Wy7KuOFr81mlDQcQQaZ79w=="
     },
     "abbrev": {
       "version": "1.1.1",
@@ -1970,9 +1970,9 @@
       "integrity": "sha1-rOEWq1V80Zc4ak6I9GhTeMiy5Po="
     },
     "underscore": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.11.0.tgz",
-      "integrity": "sha512-xY96SsN3NA461qIRKZ/+qox37YXPtSBswMGfiNptr+wrt6ds4HaMw23TP612fEyGekRE6LNRiLYr/aqbHXNedw=="
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.10.2.tgz",
+      "integrity": "sha512-N4P+Q/BuyuEKFJ43B9gYuOj4TQUHXX+j2FqguVOpjkssLUUrnJofCcBccJSCoeturDoZU6GorDTHSvUDlSQbTg=="
     },
     "underscore.string": {
       "version": "3.3.5",

package.json

@@ -13,7 +13,7 @@
   "dependencies": {
     "@types/bunyan": "^1.8.6",
     "@types/node": "^14.0.13",
-    "@types/underscore": "^1.10.0",
+    "@types/underscore": "^1.10.24",
     "async": "^3.2.0",
     "axios": "^0.19.2",
     "bunyan": "^1.8.14",
@@ -33,7 +33,7 @@
     "sqlite3": "latest",
     "typeorm": "^0.2.29",
     "typescript": "^4.0.5",
-    "underscore": "latest",
+    "underscore": "^1.10.2",
     "underscore.string": "latest",
     "ws": "^1.1.1"
   },