Corona-Warn-App/build.gradle · b3ec381f711439dd77826eae316762db09baae44 · Felix Foertsch / Cwa App Android

4 years ago

Merge branch 'release/1.4.x' into fix/pull_14X_into_15X · 7e9840fe

Matthias Urhahn authored 4 years ago

# Conflicts:
#	Corona-Warn-App/src/device/java/de/rki/coronawarnapp/ui/main/MainFragment.kt
#	Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/ui/main/MainFragment.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/riskdetails/RiskDetailsFragment.kt
#	Corona-Warn-App/src/main/res/values-de/strings.xml
#	Corona-Warn-App/src/main/res/values-pl/strings.xml
#	Corona-Warn-App/src/main/res/values/strings.xml
#	Corona-Warn-App/src/test/java/testhelpers/preferences/MockSharedPreferences.kt

7e9840fe

History

Merge branch 'release/1.4.x' into fix/pull_14X_into_15X

Matthias Urhahn authored 4 years ago

# Conflicts:
#	Corona-Warn-App/src/device/java/de/rki/coronawarnapp/ui/main/MainFragment.kt
#	Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/ui/main/MainFragment.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/riskdetails/RiskDetailsFragment.kt
#	Corona-Warn-App/src/main/res/values-de/strings.xml
#	Corona-Warn-App/src/main/res/values-pl/strings.xml
#	Corona-Warn-App/src/main/res/values/strings.xml
#	Corona-Warn-App/src/test/java/testhelpers/preferences/MockSharedPreferences.kt

Code owners

Assign users and groups as approvers for specific file changes. Learn more.