Skip to content
Snippets Groups Projects
Unverified Commit 689ef69c authored by Kolya Opahle's avatar Kolya Opahle
Browse files

Merge branch 'feature/3456-enfv2-main-branch'


Signed-off-by: default avatarKolya Opahle <k.opahle@sap.com>

Conflicts:
	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/risk/DefaultRiskLevels.kt
	Corona-Warn-App/src/test/java/de/rki/coronawarnapp/nearby/windows/ExposureWindowsCalculationTest.kt
	Corona-Warn-App/src/test/java/de/rki/coronawarnapp/risk/RiskLevelsTest.kt
parents bc59d9c2 a96bb279
No related branches found
No related tags found
Loading
Showing
with 110 additions and 327 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