seb-server/src/main/java/ch/ethz/seb/sebserver/gbl/util
anhefti 9896258afc Merge remote-tracking branch 'origin/dev-1.2' into development
Conflicts:
	src/main/java/ch/ethz/seb/sebserver/gbl/util/Utils.java
	src/main/java/ch/ethz/seb/sebserver/gui/content/ProctorRoomConnectionsPopup.java
	src/main/java/ch/ethz/seb/sebserver/gui/content/SEBClientEvents.java
	src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/SEBClientConnectionServiceImpl.java
	src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/ClientEventController.java
2021-11-10 13:25:26 +01:00
..
Cryptor.java certs impl 2021-05-04 21:59:04 +02:00
Pair.java fixed registration (institutional) and code cleanup 2020-02-24 12:42:48 +01:00
Result.java SEBSERV-191 gui implementation and download streaming 2021-11-04 16:52:48 +01:00
SizedArrayNonBlockingQueue.java SEBSERV-139 refactoring of townhall and instruction service 2020-11-12 13:28:03 +01:00
Tuple.java GUI improvements 2020-02-13 16:46:36 +01:00
Tuple3.java GUI improvements 2020-02-13 16:46:36 +01:00
Utils.java Merge remote-tracking branch 'origin/dev-1.2' into development 2021-11-10 13:25:26 +01:00