inscription (suite)
.
.
Create Meet
Mise à niveau
csproj
Merge branch 'master' of https://github.com/alemaitour/OpenData into dev_adebag

Conflicts:
	YourSport/Views/Home/Index.cshtml
	YourSport/YourSport.csproj
.
delete pour pull
conflits avec dll / ldf et mdf
...
Finished
Profil
Merge branch 'dev_adebag' of https://github.com/alemaitour/OpenData
Merge branch 'dev_cjourdan' of https://github.com/alemaitour/OpenData
fix last
Merge branch 'master' of https://github.com/alemaitour/OpenData into dev_ccaly

Conflicts:
	YourSport/Controllers/PersonneController.cs
	YourSport/YourSport.csproj
	YourSport/YourSport.csproj.orig