merge master, resolve conflicts
This commit is contained in:
Generated
+22
-1266
File diff suppressed because it is too large
Load Diff
+1
-1
@@ -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
@@ -14,4 +14,4 @@ async function startBot(botConfig) {
|
||||
}
|
||||
|
||||
bot.startBot();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user