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

Merge branch 'release/1.13.x' into fix/DEV-merge-1_13-into-1_14

# Conflicts:
#	Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/onboarding/OnboardingFragmentTest.kt
#	Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/submission/SubmissionConsentFragmentTest.kt
#	Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/datadonation/ui/DataDonationTestFragmentViewModel.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/tracing/ui/details/TracingDetailsItemProvider.kt
#	Corona-Warn-App/src/main/res/values/contact_diary_strings.xml
#	gradle.properties
parents 7efe1c9f 3226247f
No related branches found
No related tags found
No related merge requests found
Showing
with 801 additions and 30 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