anhefti b6433c7c99 Merge branch 'dev-1.3' into development ... Conflicts: pom.xml		2022-03-23 12:34:39 +01:00
..
java/ch/ethz/seb/sebserver	Merge branch 'dev-1.3' into development	2022-03-23 12:34:39 +01:00
resources	SEBSERV-240 implementation	2022-03-23 11:34:54 +01:00