_Bastler
|
0e1dff6a11
|
Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop_vite
|
2022-02-26 11:11:51 +01:00 |
|
_Bastler
|
ac4f16ad03
|
Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop_vite
|
2022-02-23 17:07:14 +01:00 |
|
_Bastler
|
021a2511e0
|
Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop_vite
|
2022-02-23 16:59:15 +01:00 |
|
Gregoire Parant
|
658781e02e
|
Merge branch 'master' into develop
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
# Conflicts:
# front/public/resources/logos/meet.svg
|
2022-02-22 23:40:48 +01:00 |
|
Gregoire Parant
|
3541f153fa
|
Push Jitsi icon
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
|
2022-02-22 23:37:28 +01:00 |
|
Lukas Hass
|
2755489ccf
|
Merge branch 'develop' into vite
|
2022-02-17 15:20:58 +01:00 |
|
Lukas Hass
|
29cdb1a8e5
|
Merge branch 'develop' into vite
|
2022-02-13 11:46:26 +01:00 |
|
Lukas Hass
|
f87704b2ef
|
remove redundant font loading
see fd70d89061/README.md (custom)
|
2022-02-01 01:29:38 +01:00 |
|
Lukas Hass
|
590e16ff8a
|
move all static assets to public/
|
2022-01-31 16:14:34 +01:00 |
|