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

Merge branch 'release/1.12.x' into fix/DEV-112-into-113

# Conflicts:
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/tracing/ui/details/TracingDetailsItemProvider.kt
#	Corona-Warn-App/src/main/res/values/release_info_strings.xml
#	gradle.properties
parents c742b688 15fd2353
No related branches found
No related tags found
Loading
Showing
with 256 additions and 44 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