David Négrier aaaa192b71 Merge branch 'develop' of github.com:thecodingmachine/workadventure into iframe_api ... # Conflicts: # front/dist/.gitignore # front/dist/index.tmpl.html # front/src/Phaser/Game/GameScene.ts # front/src/WebRtc/CoWebsiteManager.ts		2021-03-28 16:53:15 +02:00
..
characters/pipoya
customisation
fonts	FEAT: prototype game menu using html elements, better icon for text chat	2020-12-15 16:37:57 +01:00
html	FEATURE: warning message when world is near full capacity	2021-03-23 17:44:47 +01:00
items/computer
logos	FEATURE: implemented a client side blacklist	2021-02-12 19:15:24 +01:00
objects	Add Firefox image	2021-03-19 12:04:37 +01:00
style	Merge branch 'develop' of github.com:thecodingmachine/workadventure into iframe_api	2021-03-28 16:53:15 +02:00