Commit ff7db52d authored by okhin's avatar okhin 🚴

Merge branch 'preprod' into '32-nouveau-front'

# Conflicts:
#   app/view/user/perso.html
parents ddb2d3c7 36d455d9