David Négrier 0c279750be Merge branch 'master' of github.com:thecodingmachine/workadventure into develop ... # Conflicts: # front/src/Phaser/Game/GameScene.ts		2021-05-11 16:43:34 +02:00
..
resources	Merge branch 'master' of github.com:thecodingmachine/workadventure into develop	2021-05-11 16:43:34 +02:00
static/images	Improvement feature circle discussion (#977)	2021-05-05 01:49:04 +02:00
.gitignore	Merge branch 'develop' of github.com:thecodingmachine/workadventure into iframe_api	2021-03-28 16:53:15 +02:00
.htaccess	Fixing rewriterule with register link in prod	2020-10-14 13:52:02 +02:00
ga.html.tmpl	Template google analytics data	2021-01-19 12:17:05 +01:00
iframe.html	Adding the ability to register a single script using the "script" attribute at the map property level.	2021-03-07 21:02:38 +01:00
index.tmpl.html	Improvement feature circle discussion (#977)	2021-05-05 01:49:04 +02:00