Merge branch 'release/1.10.x' into fix/1.10.x-into-1.11.x
# Conflicts: # gradle.properties
No related branches found
No related tags found
Showing
- Corona-Warn-App/src/main/AndroidManifest.xml 3 additions, 1 deletionCorona-Warn-App/src/main/AndroidManifest.xml
- Corona-Warn-App/src/main/assets/privacy_de.html 2 additions, 4 deletionsCorona-Warn-App/src/main/assets/privacy_de.html
- Corona-Warn-App/src/main/assets/privacy_en.html 2 additions, 2 deletionsCorona-Warn-App/src/main/assets/privacy_en.html
- Corona-Warn-App/src/main/assets/privacy_tr.html 2 additions, 4 deletionsCorona-Warn-App/src/main/assets/privacy_tr.html
- Corona-Warn-App/src/main/assets/technical.html 1 addition, 1 deletionCorona-Warn-App/src/main/assets/technical.html
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/retention/ContactDiaryCleanTask.kt 1 addition, 0 deletions...nawarnapp/contactdiary/retention/ContactDiaryCleanTask.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/storage/ContactDiaryStorageModule.kt 0 additions, 24 deletions...warnapp/contactdiary/storage/ContactDiaryStorageModule.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/storage/dao/BaseDao.kt 1 addition, 1 deletion.../de/rki/coronawarnapp/contactdiary/storage/dao/BaseDao.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/storage/dao/BaseRoomDao.kt 1 addition, 1 deletion...rki/coronawarnapp/contactdiary/storage/dao/BaseRoomDao.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/storage/repo/ContactDiaryRepository.kt 5 additions, 2 deletions...rnapp/contactdiary/storage/repo/ContactDiaryRepository.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/storage/repo/DefaultContactDiaryRepository.kt 43 additions, 16 deletions...ontactdiary/storage/repo/DefaultContactDiaryRepository.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/ContactDiaryActivity.kt 6 additions, 5 deletions...rki/coronawarnapp/contactdiary/ui/ContactDiaryActivity.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/ContactDiarySettings.kt 0 additions, 2 deletions...rki/coronawarnapp/contactdiary/ui/ContactDiarySettings.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/ContactDiaryUIModule.kt 5 additions, 10 deletions...rki/coronawarnapp/contactdiary/ui/ContactDiaryUIModule.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/ContactDiaryDayFragment.kt 6 additions, 2 deletions...onawarnapp/contactdiary/ui/day/ContactDiaryDayFragment.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/ContactDiaryDayViewModel.kt 2 additions, 6 deletions...nawarnapp/contactdiary/ui/day/ContactDiaryDayViewModel.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/tabs/location/ContactDiaryLocationListAdapter.kt 5 additions, 5 deletions...y/ui/day/tabs/location/ContactDiaryLocationListAdapter.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/tabs/location/ContactDiaryLocationListViewModel.kt 11 additions, 1 deletion...ui/day/tabs/location/ContactDiaryLocationListViewModel.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/tabs/person/ContactDiaryPersonListAdapter.kt 5 additions, 5 deletions...diary/ui/day/tabs/person/ContactDiaryPersonListAdapter.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/tabs/person/ContactDiaryPersonListViewModel.kt 11 additions, 1 deletion...ary/ui/day/tabs/person/ContactDiaryPersonListViewModel.kt
Please register or sign in to comment