Merge origin/master

Browse Source

Conflicts:
	src/java/bdd/PompierMysql.java
	web/WEB-INF/ProfilJSP.jsp

...

This commit is contained in:

thomas.millot

2021-12-14 08:44:24 +01:00

commit eae43733b0

45 changed files with 5162 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

web/images/favicon.ico Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.3 KiB

BIN

web/images/logo-sdis.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 13 KiB

BIN

web/images/pompier.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.0 KiB