Merge branch 'master' into 6-ajout-axel

# Conflicts: # CONTRIBUTORS.md

Merge branch 'master' into 6-ajout-axel
# Conflicts: # CONTRIBUTORS.md
c4efef0f · Axel CASSULO · 8cc1ba4c · 3814eb40 · c4efef0f
Commit c4efef0f authored Jul 12, 2018 by Axel CASSULO
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
 * Axel CASSULO, CD69
\ No newline at end of file