Merge branch 'develop' into add_start_dev

This commit is contained in:
Michael Teeuw
2021-01-21 15:08:44 +01:00
committed by GitHub
18 changed files with 357 additions and 218 deletions

View File

@@ -46,10 +46,10 @@
"chai": "^4.2.0",
"chai-as-promised": "^7.1.1",
"eslint-config-prettier": "^7.1.0",
"eslint-plugin-jsdoc": "^30.7.13",
"eslint-plugin-jsdoc": "^31.0.6",
"eslint-plugin-prettier": "^3.3.1",
"express-basic-auth": "^1.2.0",
"husky": "^4.3.6",
"husky": "^4.3.8",
"jsdom": "^16.4.0",
"lodash": "^4.17.20",
"mocha": "^8.2.1",
@@ -70,7 +70,7 @@
"dependencies": {
"colors": "^1.4.0",
"console-stamp": "^3.0.0-rc4.2",
"eslint": "^7.17.0",
"eslint": "^7.18.0",
"express": "^4.17.1",
"express-ipfilter": "^1.1.2",
"feedme": "^2.0.2",
@@ -84,7 +84,7 @@
"rrule": "^2.6.6",
"rrule-alt": "^2.2.8",
"simple-git": "^2.31.0",
"socket.io": "^3.0.5",
"socket.io": "^3.1.0",
"valid-url": "^1.0.9"
},
"_moduleAliases": {