Commit b3cdcd31 authored by Ismail Moumni's avatar Ismail Moumni
Browse files

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

# Conflicts:
#   softwares/database/database.py
#   softwares/server/server.py
parents 5972adc7 b14cf2b0
Pipeline #1425 passed with stage
in 14 seconds