Merge branch 'develop' of github.com:thecodingmachine/workadventure into scaling
# Conflicts: # front/src/Phaser/Game/GameScene.ts
This commit is contained in:
commit
2122014947
17 changed files with 328 additions and 60 deletions
|
@ -52,7 +52,7 @@
|
|||
"multer": "^1.4.2",
|
||||
"prom-client": "^12.0.0",
|
||||
"query-string": "^6.13.3",
|
||||
"systeminformation": "^4.27.11",
|
||||
"systeminformation": "^4.30.5",
|
||||
"ts-node-dev": "^1.0.0-pre.44",
|
||||
"typescript": "^3.8.3",
|
||||
"uWebSockets.js": "uNetworking/uWebSockets.js#v18.5.0",
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue