Corona-Warn-App/src/main/res/values/dimens.xml · eb1e3c5c1d5fda0c35e9b4cd72a401cd30e524af · Felix Foertsch / Cwa App Android

4 years ago

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

Matthias Urhahn authored 4 years ago

# 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

86b9c3b1

History

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

Matthias Urhahn authored 4 years ago

# 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

Code owners