Commit 719e1215 by Administrator

Merge branch 'dev_cooperatic' into '5266-ajout-colonne-rattrapage-choisis'

# Conflicts:
#   members/static/js/admin/manage_makeups.js
parents c3c4790a 2751827f
Pipeline #3136 failed with stage
in 1 minute 7 seconds