Merge branch 'master' into setupBranch

2020-10-23 13:11:56 +02:00
parent 24eb43239b 5c2dea3ab4
commit c16f7cf68f
10 changed files with 427 additions and 337 deletions
--- a/Client/Views/LoginScreen.xaml.cs
+++ b/Client/Views/LoginScreen.xaml.cs
@@ -1,4 +1,5 @@
-using SharedClientServer;
+using Client.ViewModels;
+using SharedClientServer;
 using System;
 using System.Collections.Generic;
 using System.Text;