David Négrier 6b970adc6c Merge branch 'develop' of github.com:thecodingmachine/workadventure into outline ...

# Conflicts:
#	front/src/Phaser/Game/GameScene.ts
#	front/src/Phaser/Player/Player.ts
#	front/src/index.ts
#	front/yarn.lock

2020-08-17 22:51:37 +02:00

..

resources

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

2020-08-17 22:51:37 +02:00

static/images

Porting favicon to the "front" container

2020-06-09 09:21:24 +02:00

.htaccess

Fixing htaccess redirect

2020-05-13 09:29:18 +02:00

index.html

Adding CoWebsiteManager + first working version of flex video

2020-08-13 18:21:48 +02:00