anhefti 16582d0ce8 Merge remote-tracking branch 'origin/dev-1.3' into development ... Conflicts: src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/InternalClientConnectionDataFactory.java src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/SEBClientConnectionServiceImpl.java src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/indicator/AbstractClientIndicator.java		2022-03-30 15:20:16 +02:00
..
java/ch/ethz/seb/sebserver	Merge remote-tracking branch 'origin/dev-1.3' into development	2022-03-30 15:20:16 +02:00
resources	Finished exam test	2022-03-29 15:26:31 +02:00