Merge branch 'develop' into newDoctor

2020-10-14 15:21:03 +02:00
parent d8a3baeec1 ea4093ff75
commit 6e534c318b
20 changed files with 74 additions and 270 deletions
--- a/DoctorApp/ViewModels/LoginViewModel.cs
+++ b/DoctorApp/ViewModels/LoginViewModel.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.Text;
 using System.Windows.Controls;
 using System.Windows.Input;
+using Util;

 namespace DoctorApp.ViewModels
 {
--- a/DoctorApp/ViewModels/MainViewModel.cs
+++ b/DoctorApp/ViewModels/MainViewModel.cs
@@ -5,6 +5,7 @@ using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Text;
 using System.Windows.Controls;
+using Util;

 namespace DoctorApp.ViewModels
 {
--- a/DoctorApp/ViewModels/MainWindowViewModel.cs
+++ b/DoctorApp/ViewModels/MainWindowViewModel.cs
@@ -3,6 +3,7 @@ using DoctorApp.Utils;
 using System;
 using System.Collections.Generic;
 using System.Text;
+using Util;

 namespace DoctorApp.ViewModels
 {