Sem van der Hoeven 61577e0df7 [FIX] fixed merge conflicts

2020-10-21 20:56:38 +02:00

..

Information.cs

wpf sucks v2

2020-10-13 14:15:38 +02:00

ServerClient.cs

[FIX] fixed merge conflicts

2020-10-21 20:56:38 +02:00

ServerCommunication.cs

Merge branch 'lobbies' into setupBranch

2020-10-21 20:44:11 +02:00