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

Merge branch 'release/2.4.x' into release/2.5.x 

# Conflicts:
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/person/ui/overview/items/CovidTestCertificatePendingCard.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/ui/CertificatesViewModel.kt
#	gradle.properties
parents 79102803 82f7f394
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 156 additions and 60 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment