Commit 47935e1c authored by okhin's avatar okhin 🚴

Merge branch 'master' into 'preprod'

# Conflicts:
#   app/controller/perso.php
parents 42f5dfd1 03501da1
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment