Commit c183a62e authored by Matthieu FAURE's avatar Matthieu FAURE

correction conflit

# Conflicts:
#   CONTRIBUTORS.md
parents 443c86f1 90e2936f
# Contributros
* Marielle PASCALON, D69
* Matthieu FAURE, Adullact (pour de vrai)
* Thomas Grimbert, SOPRA
* Hubert BOCQUET, CD59
\ No newline at end of file
* Hubert BOCQUET, CD59
* Remi Baudchon, CD59
* Tédé NGUYEN KHAC, CD69
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