Commit 761f7fe4 authored by Detto Julien's avatar Detto Julien

fix conflicts

parents 74b86d00 794e5c19
# Contributros
# Contributors
* Marielle PASCALON, D69
* Matthieu FAURE, Adullact (pour de vrai)
......@@ -8,3 +8,5 @@
* Tédé NGUYEN KHAC, CD69
* Axel CASSULO, CD69
* Julien DETTO, CD47
* Michaël REHSPRINGER, CD47
* Cédric MAIRAL, CD47
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