Merge branch 'develop' of github.com:thecodingmachine/workadventure into protobuf

# Conflicts:
#	back/package.json
This commit is contained in:
David Négrier 2020-09-24 16:22:16 +02:00
commit cd083a2090
7 changed files with 90 additions and 3 deletions

View file

@ -36,6 +36,7 @@
},
"homepage": "https://github.com/thecodingmachine/workadventure#readme",
"dependencies": {
"axios": "^0.20.0",
"body-parser": "^1.19.0",
"express": "^4.17.1",
"generic-type-guard": "^3.2.0",