Merge branch 'develop' into window-restyle

2020-10-14 15:30:00 +02:00
parent c13cdf64b6 e226ab586e
commit ed19714338
38 changed files with 1065 additions and 102 deletions
--- a/ClientApp/ViewModels/MainWindowViewModel.cs
+++ b/ClientApp/ViewModels/MainWindowViewModel.cs
@@ -6,6 +6,7 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Text;
+using Util;
 using System.Windows;
 using System.Windows.Input;