Skip to content
Snippets Groups Projects
  1. Apr 28, 2021
  2. Apr 27, 2021
  3. Apr 26, 2021
  4. Apr 23, 2021
    • Matthias Urhahn's avatar
      Merge branch 'release/2.0.x' into release/2.1.x · cf0f5fe6
      Matthias Urhahn authored
      # Conflicts:
      #	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/checkins/CheckInEvent.kt
      #	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/checkins/CheckInsViewModel.kt
      #	Corona-Warn-App/src/main/res/values-bg/release_info_strings.xml
      #	Corona-Warn-App/src/main/res/values-de/release_info_strings.xml
      #	Corona-Warn-App/src/main/res/values-en/release_info_strings.xml
      #	Corona-Warn-App/src/main/res/values-pl/release_info_strings.xml
      #	Corona-Warn-App/src/main/res/values-ro/release_info_strings.xml
      #	Corona-Warn-App/src/main/res/values-tr/release_info_strings.xml
      #	Corona-Warn-App/src/main/res/values/release_info_strings.xml
      #	gradle.properties
      cf0f5fe6
Loading