Skip to content

Commit

Permalink
Merge branch 'dev' into issue/SITE-62
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/DotNest.Core.SDK.Web/DotNest.Core.SDK.Web.csproj
#	src/Themes/Sample.Theme/Sample.Theme.csproj
  • Loading branch information
wAsnk committed Jan 25, 2024
2 parents 9041b9f + c043670 commit 37d044d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions src/DotNest.Core.SDK.Web/DotNest.Core.SDK.Web.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
<PackageReference Include="Lombiq.Hosting.Tenants.IdleTenantManagement" Version="6.0.0" />
<PackageReference Include="Lombiq.Privacy" Version="6.0.0" />
<PackageReference Include="Lombiq.SetupExtensions" Version="5.0.0" />
<PackageReference Include="Lombiq.Hosting.MediaTheme" Version="5.0.1" />
<PackageReference Include="Lombiq.Hosting.MediaTheme.Bridge" Version="5.0.1" />
<PackageReference Include="Lombiq.Hosting.MediaTheme" Version="5.0.1-alpha.1.osoe-775" />
<PackageReference Include="Lombiq.Hosting.MediaTheme.Bridge" Version="5.0.1-alpha.1.osoe-775" />
<PackageReference Include="Lombiq.Tests.UI.Shortcuts" Version="8.2.1-alpha.6.osoe-351" />
<PackageReference Include="Lombiq.Walkthroughs" Version="1.0.0-alpha.1.lmbq-113" />
</ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/Themes/Sample.Theme/Sample.Theme.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
<PackageReference Include="OrchardCore.DisplayManagement" Version="1.7.0" />
<PackageReference Include="OrchardCore.ResourceManagement" Version="1.7.0" />
<PackageReference Include="Lombiq.BaseTheme" Version="5.0.0" />
<PackageReference Include="Lombiq.Hosting.MediaTheme" Version="5.0.1" />
<PackageReference Include="Lombiq.Hosting.MediaTheme.Targets" Version="5.0.1" />
<PackageReference Include="Lombiq.Hosting.MediaTheme" Version="5.0.1-alpha.1.osoe-775" />
<PackageReference Include="Lombiq.Hosting.MediaTheme.Targets" Version="5.0.1-alpha.1.osoe-775" />
</ItemGroup>

<ItemGroup>
Expand Down

0 comments on commit 37d044d

Please sign in to comment.