Commit aaef5e26 authored by Tédé NGUYEN KHAC's avatar Tédé NGUYEN KHAC

Merge conflit Tédé avec master

parents c54ce3b3 3814eb40
# Contributros
* Matthieu FAURE, Adullact
* Matthieu FAURE, Adullact (pour de vrai)
* Thomas Grimbert, SOPRA
* Tédé NGUYEN KHAC, 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