Christine Coenen 92ce28aaed Merge branch 'develop-next' into feature/tv-mediathek-ui ... # Conflicts: # app/src/main/AndroidManifest.xml # app/src/main/java/de/christinecoenen/code/zapp/app/livestream/ui/list/adapter/ChannelListAdapter.kt # app/src/main/java/de/christinecoenen/code/zapp/app/livestream/ui/list/adapter/ChannelViewHolder.kt		2022-04-24 10:38:48 +02:00
..
schemas/de.christinecoenen.code.zapp.persistence.Database	Convert MediathekShow to kotlin	2021-01-09 20:35:28 +01:00
src	Merge branch 'develop-next' into feature/tv-mediathek-ui	2022-04-24 10:38:48 +02:00
.gitignore	Initial commit	2016-09-12 12:20:24 +02:00
build.gradle	Merge branch 'develop-next' into feature/tv-mediathek-ui	2022-04-24 10:38:48 +02:00
lint.xml	Fix all remaining lint issues #34	2016-10-12 11:03:21 +02:00
proguard-rules.pro	Actually proguard rules that fix the bug :-/	2021-10-15 21:39:06 +02:00