Christine Coenen eaecc2460d Merge branch 'develop' into feature/android-tv-settings ... # Conflicts: # app/src/main/java/de/christinecoenen/code/zapp/app/settings/ui/SettingsFragment.kt		2023-12-22 09:05:30 +01:00
..
schemas/de.christinecoenen.code.zapp.persistence.Database	Add bookmark date	2022-11-20 17:53:00 +01:00
src	Merge branch 'develop' into feature/android-tv-settings	2023-12-22 09:05:30 +01:00
.gitignore
build.gradle	Merge branch 'develop' into feature/android-tv-settings	2023-12-22 09:05:30 +01:00
lint.xml	Opt in to experimental media3 features	2023-03-23 12:28:22 +01:00
proguard-rules.pro	Fix crash caused by code shrinker when channel order has been changed	2023-07-21 18:24:20 +02:00