Christine Coenen a190d2271f Merge branch 'feature/mediathek-search-result-count' into develop-next ... # Conflicts: # app/src/main/res/raw/changelog.md		2022-04-20 18:17:14 +02:00
..
schemas/de.christinecoenen.code.zapp.persistence.Database	Convert MediathekShow to kotlin	2021-01-09 20:35:28 +01:00
src	Merge branch 'feature/mediathek-search-result-count' into develop-next	2022-04-20 18:17:14 +02:00
.gitignore	Initial commit	2016-09-12 12:20:24 +02:00
build.gradle	Update coroutines test library	2022-04-20 18:14:36 +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