controleur commentaires
controleur commentaires
controleur commentaires
controleur commentaires
Merge origin/Emmanuelle into Gael
controleur commentaires
merge Mardi PM Gael
controleur commentaires
controleur commentaires
merge Mardi PM Gael
controleur commentaires
controleur commentaires
Merge pull request #23 from garzgul/Gael

Gael
Merge branch 'master' into Eddy

Conflicts:
	src/java/DAO/livre/LivreDAO.java
	src/java/bean/metier/LivreGestion.java
	src/java/servlet/Controleur.java
Merge branch 'Eddy'
Merge branch 'master' into Mourad

Conflicts:
	src/java/bean/metier/AcheteurGestion.java
	src/java/servlet/Controleur.java
	web/WEB-INF/compte/inscriptionacheteur.jsp
	web/WEB-INF/main/Main.jsp

merge mourad mercredi matin
Merge branch 'Mourad'
Merge branch 'master' into Emmanuelle

Conflicts:
	src/java/bean/metier/AcheteurGestion.java
	src/java/servlet/Controleur.java
	web/WEB-INF/compte/inscriptionacheteur.jsp
	web/WEB-INF/main/Main.jsp
commit Emma mercredi matin