Merge branch 'develop' into feature/global-message
# Conflicts: # back/src/App.ts
This commit is contained in:
commit
bcb126a146
7 changed files with 90 additions and 2 deletions
|
@ -42,6 +42,7 @@
|
|||
"@types/multer": "^1.4.4",
|
||||
"@types/socket.io": "^2.1.4",
|
||||
"@types/uuidv4": "^5.0.0",
|
||||
"axios": "^0.20.0",
|
||||
"body-parser": "^1.19.0",
|
||||
"express": "^4.17.1",
|
||||
"generic-type-guard": "^3.2.0",
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue