Skip to content

Commit

Permalink
Merge branch 'Beta-Nightly' into Beta-Dev
Browse files Browse the repository at this point in the history
  • Loading branch information
jacobsen9026 committed Nov 15, 2023
2 parents 42f156e + 5b549b1 commit e432284
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 2 additions & 0 deletions BLAZAM/BLAZAM.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<ServerGarbageCollection>false</ServerGarbageCollection>
<AssemblyVersion>0.8.4</AssemblyVersion>
<Version>2023.11.14.2346</Version>

<RootNamespace>BLAZAM</RootNamespace>
<GenerateDocumentationFile>False</GenerateDocumentationFile>

Expand Down Expand Up @@ -84,6 +85,7 @@
<ItemGroup>
<None Include="..\BLAZAMGui\UI\Chat\ChatMessage.razor" Link="ChatMessage.razor" />
<None Include="..\BLAZAMGui\UI\Inputs\ADAutoCompleteResult.razor" Link="ADAutoCompleteResult.razor" />
<None Include="..\BLAZAMGui\UI\Settings\AvailableUpdate.razor" Link="AvailableUpdate.razor" />
<None Include="..\BLAZAMGui\UI\Settings\Templates\AssignedTemplateGroup.razor" Link="AssignedTemplateGroup.razor" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion BLAZAMGui/UI/Settings/ManualApplicationUpdater.razor
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@
}



</MudTimeline>

@if (AutoUpdateService.IsUpdatedScheduled)
Expand Down Expand Up @@ -193,7 +194,6 @@
await InvokeAsync(StateHasChanged);
}



async Task ApplyUpdate()
{
Expand Down

0 comments on commit e432284

Please sign in to comment.