anhefti 54a0f05a39 Merge remote-tracking branch 'origin/dev-1.2' into development ... Conflicts: src/main/java/ch/ethz/seb/sebserver/gui/content/MonitoringClientConnection.java		2021-09-16 08:37:34 +02:00
..
ethz/seb/sebserver	Merge remote-tracking branch 'origin/dev-1.2' into development	2021-09-16 08:37:34 +02:00