AZEN-SGG/Kavita
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' of https://github.com/Kareadita/Kavita into bugfix/matching-stuff

Browse source 
# Conflicts:
#	UI/Web/src/app/settings/_components/setting-switch/setting-switch.component.ts
This commit is contained in:
Joseph Milazzo 2025-06-13 19:09:04 -05:00
commit ec5578f1e1
2 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Kavita.Common/Kavita.Common.csproj
View file

@ -3,7 +3,7 @@
<TargetFramework>net9.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<Company>kavitareader.com</Company> <Company>kavitareader.com</Company>
<Product>Kavita</Product> <Product>Kavita</Product>
<AssemblyVersion>0.8.6.13</AssemblyVersion> <AssemblyVersion>0.8.6.14</AssemblyVersion>
<NeutralLanguage>en</NeutralLanguage> <NeutralLanguage>en</NeutralLanguage>
<TieredPGO>true</TieredPGO> <TieredPGO>true</TieredPGO>
</PropertyGroup> </PropertyGroup>

1
UI/Web/src/app/settings/_components/setting-switch/setting-switch.component.ts
View file

@ -62,7 +62,6 @@ export class SettingSwitchComponent implements AfterContentInit {
}); });
} }
private generateId(): string { private generateId(): string {
if (crypto && crypto.randomUUID) { if (crypto && crypto.randomUUID) {
return crypto.randomUUID(); return crypto.randomUUID();