merge master, resolve conflicts

This commit is contained in:
2022-02-27 00:29:34 +01:00
3 changed files with 24 additions and 1268 deletions
+22 -1266
View File
File diff suppressed because it is too large Load Diff
+1 -1
View File
@@ -15,7 +15,7 @@
"author": "starappeal, tsomic",
"license": "MIT",
"dependencies": {
"axios": "^0.21.1",
"axios": "^0.21.4",
"dateformat": "^3.0.3",
"dotenv": "^8.2.0",
"express": "^4.17.1",
+1 -1
View File
@@ -14,4 +14,4 @@ async function startBot(botConfig) {
}
bot.startBot();
}
}