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:
@@ -84,3 +84,10 @@ aside, #btAfficherPompier {
|
||||
select[readonly] {
|
||||
pointer-events: none;
|
||||
}
|
||||
|
||||
.ztVentil{
|
||||
width:20px;
|
||||
}
|
||||
td{
|
||||
margin-left:2px;
|
||||
}
|
Reference in New Issue
Block a user