Merge remote-tracking branch 'origin/master'

2020-10-23 21:07:27 +02:00
parent 2d4540e28e 052f07db93
commit b9b217622a
7 changed files with 106 additions and 1 deletions
--- a/Client/ViewModels/ViewModelGame.cs
+++ b/Client/ViewModels/ViewModelGame.cs
@@ -9,7 +9,7 @@ using System.Diagnostics;
 using System.Timers;
 using System.Windows;
 using System.Windows.Input;
-using System.Windows.Media;
+using System.Windows.Media;
 using System.Windows.Shapes;

 namespace Client.ViewModels
@@ -34,6 +34,7 @@ namespace Client.ViewModels

        public string _username;

+
        public string _message;
        public string Message
        {