Commit cb724177 authored by Matthieu Boileau's avatar Matthieu Boileau
Browse files

Merge branch 'maquette' into 'master'


See merge request groupe-calcul/website!22
parents b97a3522 86bd7073
......@@ -122,7 +122,7 @@ Script to parse JSON arriving from indico "timetable" and to insert
return newele;
Supports Markdown
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