cd16b 5ab65062e6 Merge remote-tracking branch 'refs/remotes/origin/main' into Skip-credit ... # Conflicts: # core/src/main/java/dev/jdtech/jellyfin/utils/DownloaderImpl.kt # core/src/main/res/values-it/strings.xml # core/src/main/res/values/strings.xml # data/schemas/dev.jdtech.jellyfin.database.ServerDatabase/5.json # data/src/main/java/dev/jdtech/jellyfin/database/ServerDatabase.kt # data/src/main/java/dev/jdtech/jellyfin/repository/JellyfinRepositoryImpl.kt # data/src/main/java/dev/jdtech/jellyfin/repository/JellyfinRepositoryOfflineImpl.kt # player/video/src/main/java/dev/jdtech/jellyfin/viewmodels/PlayerActivityViewModel.kt		2024-06-24 12:53:47 +02:00
..
debug/res/values	refactor: use colors instead of separate drawables to differentiate between debug, staging and release	2023-06-25 00:07:01 +02:00
main	Merge remote-tracking branch 'refs/remotes/origin/main' into Skip-credit	2024-06-24 12:53:47 +02:00
staging/res/values	refactor: use colors instead of separate drawables to differentiate between debug, staging and release	2023-06-25 00:07:01 +02:00