13/11/2014
com app.config
Merge branch 'Dev' into Romain
remove com app.conf
Revert "remove com app.conf"

This reverts commit d2cdbfcb51559666466ffb3a47184eb4aaea13c2.
Revert "Revert "remove com app.conf""

This reverts commit 2bd480d2d784757e9073333778ec2b1d46b2a0dc.
modif fichier de conf
Merge branch 'Romain' of https://github.com/TeriRomain/MDL.git
interface ajout theme
Merge remote-tracking branch 'origin/Romain' into Dev
Merge remote-tracking branch 'origin/Dev' into Romain
tache 3 : interface graphique
20/11/2014
Merge remote-tracking branch 'origin/Romain' into Dev
ajout de la procedure Vider_Champs

Signed-off-by: ducoudrayalex <ducoudray.alex@gmail.com>
PPE 20/11

- Création procédure GererInscriptionLicencie
- Création procédure TabInscription_Click
test

Signed-off-by: ducoudrayalex <ducoudray.alex@gmail.com>
Merge remote-tracking branch 'origin/Alex' into Dev

Conflicts:
	MaisonDesLigues/FrmPrincipale.Designer.cs
	MaisonDesLigues/FrmPrincipale.cs
Merge remote-tracking branch 'origin/Alex' into Dev

Conflicts:
	MaisonDesLigues/FrmPrincipale.Designer.cs
	MaisonDesLigues/FrmPrincipale.cs
Merge remote-tracking branch 'origin/ClÃ©ment' into Dev

Conflicts:
	MaisonDesLigues/FrmPrincipale.Designer.cs
	MaisonDesLigues/FrmPrincipale.cs

Signed-off-by: Clément JOLLIET <jolliet.clement@gmail.com>