Skip to content
Snippets Groups Projects
Commit cf0f5fe6 authored by Matthias Urhahn's avatar Matthias Urhahn
Browse files

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
parents 70bf5cf1 f65f66f7
No related branches found
No related tags found
Loading
Showing
with 79 additions and 13 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment