Merge branch 'main' into 'uploadImage'

# Conflicts:
#   app/controllers/controllerAnnonce.js
#   routes/listeAnnonces.js
#   views/creerAnnonce.pug