Merge conflit Tédé avec master

aaef5e26 · Tédé NGUYEN KHAC · c54ce3b3 · 3814eb40 · aaef5e26
Commit aaef5e26 authored Jul 12, 2018 by Tédé NGUYEN KHAC
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

CONTRIBUTORS.md CONTRIBUTORS.md +1 -1

No files found.
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
 # Contributros

-* Matthieu FAURE, Adullact
+* Matthieu FAURE, Adullact (pour de vrai)
 * Thomas Grimbert, SOPRA
 * Tédé NGUYEN KHAC, CD69
\ No newline at end of file