Skip to content
Snippets Groups Projects
  1. Oct 06, 2020
  2. Oct 05, 2020
  3. Oct 02, 2020
  4. Oct 01, 2020
  5. Sep 30, 2020
  6. Sep 29, 2020
    • Matthias Urhahn's avatar
      Merge branch 'release/1.4.x' into fix/pull_14X_into_15X · 7e9840fe
      Matthias Urhahn authored
      # 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
Loading