anhefti 376c3dd8c8 Merge branch 'patch-1.0.2' into development ... Conflicts: src/main/java/ch/ethz/seb/sebserver/gui/content/SEBClientLogs.java src/main/java/ch/ethz/seb/sebserver/gui/content/UserActivityLogs.java		2020-07-29 12:10:06 +02:00
..
ethz/seb/sebserver	Merge branch 'patch-1.0.2' into development	2020-07-29 12:10:06 +02:00