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

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

# 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
parents b6815dc6 7ff340f6
No related branches found
No related tags found
Loading
Showing
with 440 additions and 59 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