Merge branch 'master' into '3-d69-je-m-ajoute-aux-contributeurs-marielle'

# Conflicts: # CONTRIBUTORS.md

Merge branch 'master' into '3-d69-je-m-ajoute-aux-contributeurs-marielle'
# Conflicts: # CONTRIBUTORS.md
c6a43be9 · Matthieu FAURE · 4970f2a9 · 5715674a · c6a43be9
Commit c6a43be9 authored Jul 12, 2018 by Matthieu FAURE ⛵
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

CONTRIBUTORS.md CONTRIBUTORS.md +4 -2

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

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