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

Merge branch 'release/1.4.x' into fix/1.4.x-into-1.5.x

# Conflicts:
#	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/deviceForTesters/res/layout/fragment_test_for_a_p_i.xml
#	Corona-Warn-App/src/deviceForTesters/res/navigation/nav_graph.xml
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransaction.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/di/ApplicationComponent.kt
#	Corona-Warn-App/src/test/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransactionTest.kt
parents cff09704 fb36982c
No related branches found
No related tags found
No related merge requests found
Showing
with 1211 additions and 766 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