Merge branch 'hotfixes' into hotfix-into-staging
# Conflicts: # Corona-Warn-App/build.gradle # Corona-Warn-App/src/main/res/values-de/strings.xml
Showing
- Corona-Warn-App/src/device/java/de.rki.coronawarnapp/ui/main/MainFragment.kt 49 additions, 0 deletions.../device/java/de.rki.coronawarnapp/ui/main/MainFragment.kt
- Corona-Warn-App/src/deviceForTesters/java/de.rki.coronawarnapp/ui/main/MainFragment.kt 50 additions, 0 deletions...Testers/java/de.rki.coronawarnapp/ui/main/MainFragment.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/LocalData.kt 28 additions, 0 deletions...p/src/main/java/de/rki/coronawarnapp/storage/LocalData.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/formatter/FormatterRiskHelper.kt 49 additions, 6 deletions...e/rki/coronawarnapp/util/formatter/FormatterRiskHelper.kt
- Corona-Warn-App/src/main/res/layout/fragment_risk_details.xml 18 additions, 4 deletions...na-Warn-App/src/main/res/layout/fragment_risk_details.xml
- Corona-Warn-App/src/main/res/layout/fragment_settings_tracing.xml 7 additions, 29 deletions...arn-App/src/main/res/layout/fragment_settings_tracing.xml
- Corona-Warn-App/src/main/res/layout/include_risk_details_period_logged_card.xml 82 additions, 0 deletions...in/res/layout/include_risk_details_period_logged_card.xml
- Corona-Warn-App/src/main/res/layout/include_risk_details_period_logged_progress.xml 56 additions, 0 deletions...es/layout/include_risk_details_period_logged_progress.xml
- Corona-Warn-App/src/main/res/layout/include_setting_tracing_period_logged.xml 61 additions, 0 deletions...main/res/layout/include_setting_tracing_period_logged.xml
- Corona-Warn-App/src/main/res/values-de/strings.xml 16 additions, 1 deletionCorona-Warn-App/src/main/res/values-de/strings.xml
- Corona-Warn-App/src/main/res/values-en/strings.xml 15 additions, 1 deletionCorona-Warn-App/src/main/res/values-en/strings.xml
- Corona-Warn-App/src/main/res/values/strings.xml 18 additions, 1 deletionCorona-Warn-App/src/main/res/values/strings.xml
Loading
Please register or sign in to comment