Finir le merge, ce serait bien
Ajouter generer_url_entite
Merge branch 'master' into with_color