Gregoire Parant 1bff2addf1 Merge branch 'develop' into firefox-error-jitsi ...

# Conflicts:
#	front/src/WebRtc/MediaManager.ts

2020-11-17 18:54:51 +01:00

..

characters/pipoya

Adding a huge collection of characters to play with

2020-04-27 22:38:21 +02:00

customisation

png files

2020-07-28 11:25:19 +02:00

fonts

Changed font from text

2020-05-01 23:19:51 +02:00

items/computer

Moving maps to their own container

2020-07-23 18:43:51 +02:00

logos

Create discussion

2020-10-25 19:39:15 +01:00

objects

Ban mesage

2020-10-19 19:32:47 +02:00

style

Merge branch 'develop' into firefox-error-jitsi

2020-11-17 18:54:51 +01:00