Skip to content
Snippets Groups Projects
Commit cd319d2c authored by chris-cwa's avatar chris-cwa
Browse files

Merge remote-tracking branch 'origin/release/1.8.x' into feature/3456-enfv2-main-branch

# Conflicts:
#	Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/risklevel/ui/TestRiskLevelCalculationFragmentCWAViewModel.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/risk/DefaultRiskLevels.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/risk/RiskLevelTask.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/risk/RiskLevels.kt
#	Corona-Warn-App/src/test/java/de/rki/coronawarnapp/risk/RiskLevelsTest.kt
parents fb770796 c964aca1
No related branches found
Tags v1.13.0-RC1
No related merge requests found
Showing
with 281 additions and 29 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