inte form equipe
Merge branch 'dev' of https://github.com/SamiErrighi/gladiator-scrum into feature/rouksana
commit samantha integration
Merge branch 'feature/samantha' into dev
add js in base
merge
Ajout update équipe
Merge branch 'feature/anne' into dev

Conflicts:
	app/Resources/views/base.html.twig
Merge branch 'feature/sami' into dev

Conflicts:
	.idea/workspace.xml