Commit e726715c authored by Axel CASSULO's avatar Axel CASSULO

Correction conflit v2

# Conflicts:
parents c4efef0f e035e9fb
# Contributros # Contributros
* Marielle PASCALON, D69
* Matthieu FAURE, Adullact (pour de vrai) * Matthieu FAURE, Adullact (pour de vrai)
* Thomas Grimbert, SOPRA * Thomas Grimbert, SOPRA
* Hubert BOCQUET, CD59
* Remi Baudchon, CD59
* Axel CASSULO, CD69 * Axel CASSULO, CD69
\ No newline at end of file
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