Commit 5da205a8 authored by td.nguyenkhac's avatar td.nguyenkhac

Merge branch 'master' into 7-ajouter-tede-dans-les-contributeurs

# Conflicts:
#	CONTRIBUTORS.md
parents aaef5e26 ccbfaef9
...@@ -2,4 +2,5 @@ ...@@ -2,4 +2,5 @@
* Matthieu FAURE, Adullact (pour de vrai) * Matthieu FAURE, Adullact (pour de vrai)
* Thomas Grimbert, SOPRA * Thomas Grimbert, SOPRA
* Remi Baudchon, CD59
* Tédé NGUYEN KHAC, CD69 * 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