Commit 4907cb17 authored by Grégoire GRZECZKOWICZ's avatar Grégoire GRZECZKOWICZ

Merge branch 'master' into 'develop'

Ajout du mdp

See merge request br/chocapix-server!6
parents 9657bccc df13fb2d
Pipeline #5030 passed with stage
in 1 minute and 27 seconds