Skip to content

GitLab

Merge branch 'master' into '005-editing-server' 

# Conflicts:
#   softwares/database/database.py
#   softwares/server/server.py
1 job for 005-editing-server in 14 seconds (queued for 3 seconds)
b3cdcd31
1 related merge request: !7 WIP : 005 editing server