Merge branch 'develop' into feature/global-message

# Conflicts: # back/src/App.ts
2020-09-23 17:26:00 +02:00
parent 942d2cbcef 8b46753c7d
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",