Merge origin/master

Conflicts:
	src/java/bdd/gardeMySQL.java
	src/java/bean/Gardes.java
	src/java/servlet/GardesServlet.java
	web/WEB-INF/jspf/header.jspf
This commit is contained in:
funcha.ahamadi
2021-12-13 15:45:52 +01:00
parent 07aaf3248d
commit 40db789d06
5 changed files with 38 additions and 6 deletions

View File

@@ -84,3 +84,10 @@ aside, #btAfficherPompier {
select[readonly] {
pointer-events: none;
}
.ztVentil{
width:20px;
}
td{
margin-left:2px;
}