Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/nuget/ImperatorToCK3/DotLiquid-…
Browse files Browse the repository at this point in the history
…2.2.717
  • Loading branch information
IhateTrains authored Nov 20, 2024
2 parents 456ebd6 + 42fe736 commit ee8b212
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Fronter.NET
2 changes: 1 addition & 1 deletion ImperatorToCK3/ImperatorToCK3.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.5"/>
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.6"/>
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "9.0.100-rc.2.24474.11",
"version": "9.0.100",
"allowPrerelease": true,
"rollForward": "disable"
}
Expand Down

0 comments on commit ee8b212

Please sign in to comment.