Skip to content
Commit 34335625 authored by Fabien's avatar Fabien
Browse files

Merge origin/Elly into Fabien 

Conflicts:
	src/main/java/fr/ldnr/starWars/services/PiloteServiceImpl.java
	src/main/resources/templates/fichePilote.html
parents 94088087 8aea1d06
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment