Merge with upstream

This commit is contained in:
buxxi
2021-03-13 22:56:14 +01:00
13 changed files with 1194 additions and 1697 deletions

View File

@@ -71,17 +71,17 @@
"dependencies": {
"colors": "^1.4.0",
"console-stamp": "^3.0.0-rc4.2",
"digest-fetch": "^1.1.6",
"eslint": "^7.20.0",
"express": "^4.17.1",
"express-ipfilter": "^1.1.2",
"feedme": "^2.0.2",
"helmet": "^4.4.1",
"ical": "^0.8.0",
"iconv-lite": "^0.6.2",
"module-alias": "^2.2.2",
"moment": "^2.29.1",
"node-fetch": "^2.6.1",
"node-ical": "^0.12.8",
"request": "^2.88.2",
"rrule": "^2.6.8",
"rrule-alt": "^2.2.8",
"simple-git": "^2.36.2",