uap35-d/sdisM2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge origin/master

Browse Source 
Conflicts:
	nbproject/project.properties
	src/java/bean/Pompier.java
	src/java/servlet/PompierServlet.java
	src/java/util/TrmtDate.java
	web/WEB-INF/jspf/formulairePompier.jspf
	web/WEB-INF/jspf/header.jspf
	web/WEB-INF/web.xml
This commit is contained in:
clementine.desrucques
2021-12-13 11:07:06 +01:00
parent 785442caf6 68bf428f4f
commit 8c53a38e4b
14 changed files with 2048 additions and 2003 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
web/WEB-INF/jspf/header.jspf
View File

@@ -109,4 +109,4 @@
</nav>
</div> <!-- fin id=identie -->
</div> <!-- fin class=container -->
</header>
</header>