Skip to content
Snippets Groups Projects
Commit 75aee119 authored by chilja's avatar chilja
Browse files

Merge branch 'release/1.8.x' into fix/18x-into-19x

# Conflicts:
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/SubmissionRepository.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/home/SubmissionCardsStateProvider.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/SubmissionTestResultViewModel.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/viewmodel/SubmissionViewModel.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/DataReset.kt
#	Corona-Warn-App/src/main/res/values-de/legal_strings.xml
#	Corona-Warn-App/src/test/java/de/rki/coronawarnapp/main/home/SubmissionCardsStateProviderTest.kt
parents 12c61c94 395e3b2e
No related branches found
No related tags found
No related merge requests found
Showing
with 283 additions and 657 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