Commit b9c0d57e authored by Gauthier Rubbers's avatar Gauthier Rubbers
Browse files

Merge branch 'master' into 'master'

# Conflicts:
#   Liste_etudiants.csv
parents 2ff31026 1b521c48
This diff is collapsed.
......@@ -23,4 +23,4 @@,"Strebelle, Sébastien",Oui,"Bonaventure, Olivier",Non,"Legay, Axel",Non,"De Coninck, Quentin",Oui,"Michel, Francois",Non,"Michel, Francois",Oui
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