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

..

characters/pipoya

move all static assets to public/

2022-01-31 16:14:34 +01:00

customisation

move all static assets to public/

2022-01-31 16:14:34 +01:00

emotes

move all static assets to public/

2022-01-31 16:14:34 +01:00

fonts

remove redundant font loading

2022-02-01 01:29:38 +01:00

html

move all static assets to public/

2022-01-31 16:14:34 +01:00

icons

Merge branch 'develop' into vite

2022-02-17 15:20:58 +01:00

items/computer

move all static assets to public/

2022-01-31 16:14:34 +01:00

logos

Merge branch 'master' into develop

2022-02-22 23:40:48 +01:00

objects

move all static assets to public/

2022-01-31 16:14:34 +01:00

translations

move all static assets to public/

2022-01-31 16:14:34 +01:00