Merge remote-tracking branch 'origin/feat/api/SettingsLists' into feat/api/SettingsLists

Browse source

# Conflicts:
#	src/api/Settings.ts

...

This commit is contained in:

Elvyra 2025-01-05 22:36:17 +01:00

parent c3a51cc21b e08cfc5007

commit cfd29692b9

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available