Merge branch 'master' into Share-players-position-using-Socket.IO

# Conflicts: # back/src/Controller/IoSocketController.ts
2020-04-04 22:46:42 +02:00
parent 1100edecb7 dc1a92f086
commit 5bfedb04fd
9 changed files with 732 additions and 16 deletions
@@ -1,3 +1,5 @@
+![](https://github.com/thecodingmachine/workadventure/workflows/Continuous%20Integration/badge.svg)
+
 # Work Adventure

 ## Work in progress