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

Merge branch 'release/1.5.x' into feature/interoperability

# Conflicts:
#	.idea/codeStyles/Project.xml
#	Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/TestRiskLevelCalculationFragment.kt
#	Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/api/ui/TestForAPIFragment.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/fragment/SubmissionQRCodeScanFragment.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/fragment/SubmissionResultPositiveOtherWarningFragment.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/fragment/SubmissionTanFragment.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/di/ApplicationComponent.kt
parents 660085c8 0676ab79
No related branches found
No related tags found
No related merge requests found
Showing
with 610 additions and 437 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