Skip to content
Snippets Groups Projects
Commit e6516274 authored by Pierre Kunzli's avatar Pierre Kunzli
Browse files

Merge branch 'master' into pk

parents 2c3e0a0f 295b1052
No related branches found
No related tags found
3 merge requests!6Pk,!5Pk,!4correction recherche parent et ajout sauts slides
This commit is part of merge request !4. Comments created here will be created in the context of that merge request.
Hide whitespace changes
Inline Side-by-side
Showing
with 2393 additions and 136 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment