Merge remote-tracking branch 'origin/v2' into v2

Browse Source

# Conflicts:
#	gameyfin/src/main/kotlin/de/grimsi/gameyfin/config/ConfigService.kt

...

This commit is contained in:

grimsi

2025-05-03 16:53:08 +02:00

parent 30a49f053a 17885b5ba6

commit 67d8388568

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

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available