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

Merge branch 'release/1.13.x' into fix/DEV-merge-13-into-14 

# Conflicts:
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/http/HttpErrorParser.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/resultavailable/SubmissionTestResultAvailableViewModel.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/warnothers/SubmissionResultPositiveOtherWarningNoConsentViewModel.kt
#	Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/TimeAndDateExtensionsTest.kt
#	gradle.properties
parents 52812491 6b3ae701
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 244 additions and 45 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