anhefti 12fcaa405c Merge remote-tracking branch 'origin/patch-1.0.2' into development ... Conflicts: src/main/java/ch/ethz/seb/sebserver/gui/service/session/ClientConnectionDetails.java src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/AbstractClientIndicator.java		2020-12-02 10:01:03 +01:00
..
main	Merge remote-tracking branch 'origin/patch-1.0.2' into development	2020-12-02 10:01:03 +01:00
test	Merge remote-tracking branch 'origin/patch-1.0.2' into development	2020-12-02 10:01:03 +01:00