Merge branch 'event_group' into webrtc
authorgparant <g.parant@thecodingmachine.com>
Sun, 3 May 2020 14:18:05 +0000 (16:18 +0200)
committergparant <g.parant@thecodingmachine.com>
Sun, 3 May 2020 14:18:05 +0000 (16:18 +0200)
commit8357f9b8c247352c7b44b3af707179efeacdbfd6
tree860b910ac60d24a86402b48ae1379693970396ba
parent85ab0a231fe637496ed7ba2f006c6031029ad1ce
parent58565a7f4581dd94298c1ce83d8c9071279726d4
Merge branch 'event_group' into webrtc

# Conflicts:
# back/src/Model/Group.ts
# back/src/Model/World.ts
back/src/Model/Group.ts