anhefti 012b0e2f99 Merge remote-tracking branch 'origin/rel-1.6.1' into development ... # Conflicts: # pom.xml		2024-06-05 09:26:05 +02:00
..
java/ch/ethz/seb/sebserver	Merge remote-tracking branch 'origin/rel-1.6.1' into development	2024-06-05 09:26:05 +02:00
resources	add date to logging config	2024-06-04 12:51:30 +02:00