Commit 23cdfc32 authored by Clouard Regis's avatar Clouard Regis
Browse files

Merge branch 'master' of gitlab.com:a_boiteau/site-vikazimut-stage

 Conflicts:
	src/Entity/Track.php
	src/Form/ModifyParticipantMakeEventCourseType.php
	translations/messages.en.xlf
	translations/messages.fr.xlf
parents 6dc167f8 1c7d68b7
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