David Négrier 4e042389c5 Merge branch 'master' of github.com:thecodingmachine/workadventure into develop ...

# Conflicts:
#	front/src/Connexion/ConnectionManager.ts
#	pusher/src/Controller/AuthenticateController.ts
#	pusher/src/Controller/IoSocketController.ts
#	pusher/src/Services/JWTTokenManager.ts

2021-11-15 16:30:45 +01:00

..

AdminController.ts

Applying Prettier on pusher and back

2021-06-24 10:09:10 +02:00

AuthenticateController.ts

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

2021-11-15 16:30:45 +01:00

BaseController.ts

Release 1.4.14 (#1370)

2021-08-15 23:13:48 +02:00

DebugController.ts

fixed invalid unauathorized handler

2021-07-01 15:50:40 +02:00

IoSocketController.ts

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

2021-11-15 16:30:45 +01:00

MapController.ts

Changes ANONYMOUS variable

2021-11-12 16:43:37 +01:00

OpenIdProfileController.ts

Fix feedback @moufmouf

2021-11-15 15:58:08 +01:00

PrometheusController.ts

Applying Prettier on pusher and back

2021-06-24 10:09:10 +02:00