Merge origin/master

Conflicts: src/java/bdd/PompierMysql.java
2021-10-22 12:38:08 +02:00
parent 30e988a406
commit 0d1d4385f9
2 changed files with 2 additions and 3 deletions
--- a/web/css/newcss.css
+++ b/web/css/newcss.css
@@ -9,7 +9,7 @@ and open the template in the editor.
 */
 body
 {
-    background-color: #e2e7e9;
+    background-color: #596b6e;
    background-repeat: repeat-x;
    margin:0% 0%;
    padding : 0.9em;