Merge branch 'development' into feature/workshop

This commit is contained in:
Robert committed 2023-07-06 18:41:59 +02:00
commit 229d93901b
76 files changed
+2016 -854

No files matched your search

@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.ObjectModel;
using System.Reactive;
using System.Reactive.Linq;
@@ -15,7 +15,7 @@ using StrawberryShake;
namespace Artemis.UI.Screens.Workshop;
public class WorkshopViewModel : MainScreenViewModel
public class WorkshopViewModel : ActivatableViewModelBase, IMainScreenViewModel
{
private readonly IWorkshopClient _workshopClient;