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
..
src/main	Merge remote-tracking branch 'refs/remotes/origin/main' into Skip-credit	2024-06-24 12:53:47 +02:00
build.gradle.kts	chore: clean up dependencies	2024-05-09 12:30:23 +02:00
lint.xml	Modularize the codebase (#230)	2023-01-13 23:51:20 +01:00