Commit 8e5bf259 authored by Grégoire GRZECZKOWICZ's avatar Grégoire GRZECZKOWICZ

Merge branch 'develop' into 'master'

Résolution problèmes de classement des utilisateurs et des aliments

See merge request !13
parents 226e6bff eba45ed2
Pipeline #4663 passed with stage
in 12 minutes and 29 seconds