-
- Downloads
Merge branch 'release/2.0.x' into release/2.1.x
# Conflicts: # Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/checkins/CheckInEvent.kt # Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/checkins/CheckInsViewModel.kt # Corona-Warn-App/src/main/res/values-bg/release_info_strings.xml # Corona-Warn-App/src/main/res/values-de/release_info_strings.xml # Corona-Warn-App/src/main/res/values-en/release_info_strings.xml # Corona-Warn-App/src/main/res/values-pl/release_info_strings.xml # Corona-Warn-App/src/main/res/values-ro/release_info_strings.xml # Corona-Warn-App/src/main/res/values-tr/release_info_strings.xml # Corona-Warn-App/src/main/res/values/release_info_strings.xml # gradle.properties
Showing
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/checkins/CheckInEvent.kt 2 additions, 2 deletions...napp/ui/presencetracing/attendee/checkins/CheckInEvent.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/checkins/CheckInsFragment.kt 8 additions, 6 deletions.../ui/presencetracing/attendee/checkins/CheckInsFragment.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/checkins/CheckInsViewModel.kt 6 additions, 5 deletions...ui/presencetracing/attendee/checkins/CheckInsViewModel.kt
- Corona-Warn-App/src/main/res/values-bg/strings.xml 9 additions, 0 deletionsCorona-Warn-App/src/main/res/values-bg/strings.xml
- Corona-Warn-App/src/main/res/values-de/strings.xml 9 additions, 0 deletionsCorona-Warn-App/src/main/res/values-de/strings.xml
- Corona-Warn-App/src/main/res/values-en/strings.xml 9 additions, 0 deletionsCorona-Warn-App/src/main/res/values-en/strings.xml
- Corona-Warn-App/src/main/res/values-pl/strings.xml 9 additions, 0 deletionsCorona-Warn-App/src/main/res/values-pl/strings.xml
- Corona-Warn-App/src/main/res/values-ro/strings.xml 9 additions, 0 deletionsCorona-Warn-App/src/main/res/values-ro/strings.xml
- Corona-Warn-App/src/main/res/values-tr/strings.xml 9 additions, 0 deletionsCorona-Warn-App/src/main/res/values-tr/strings.xml
- Corona-Warn-App/src/main/res/values/strings.xml 9 additions, 0 deletionsCorona-Warn-App/src/main/res/values/strings.xml
Loading
Please register or sign in to comment