Skip to content
Commit 10ab94a9 authored by asolanas's avatar asolanas
Browse files

Merge origin/branche_test_1er_Sprint into branche_test_1er_Sprint

# Conflicts:
#	ProDigiUp_GesCollab/pom.xml
#	ProDigiUp_GesCollab/src/main/java/dao/DaoFactory.java
#	ProDigiUp_GesCollab/src/main/java/dao/ResponsableActiviteDao.java
#	ProDigiUp_GesCollab/src/main/java/entities/ResponsableActivite.java
#	ProDigiUp_GesCollab/src/main/java/forms/FormChecker.java
#	ProDigiUp_GesCollab/src/main/java/forms/ResponsableActiviteFormChecker.java
#	ProDigiUp_GesCollab/src/main/webapp/WEB-INF/jsp/afficherResponsableActivite.jsp
#	ProDigiUp_GesCollab/src/main/webapp/WEB-INF/jsp/creerResponsableActivite.jsp
#	ProDigiUp_GesCollab/src/main/webapp/WEB-INF/jsp/page_accueil.jsp
#	ProDigiUp_GesCollab/src/main/webapp/WEB-INF/jspf/header.jsp
parents 45cfbf0a c37e57ea
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment