Skip to content
Snippets Groups Projects
  1. Jun 18, 2021
  2. Jun 17, 2021
  3. Jun 16, 2021
  4. Jun 15, 2021
  5. Jun 14, 2021
  6. Jun 11, 2021
    • Matthias Urhahn's avatar
      Merge pull request #3422 from corona-warn-app/chore/DEV-23-into-24 · b26d1301
      Matthias Urhahn authored
      Merge 2.3.x into 2.4.x (DEV)
      b26d1301
    • Matthias Urhahn's avatar
      Fix LINT regression due to merge. · 418d324e
      Matthias Urhahn authored
      418d324e
    • Matthias Urhahn's avatar
      Merge branch 'release/2.3.x' into release/2.4.x · 71b65426
      Matthias Urhahn authored
      # Conflicts:
      #	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/certificate/VaccinationDccV1.kt
      #	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/repository/storage/VaccinationContainer.kt
      #	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/certificate/InvalidHealthCertificateException.kt
      #	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/certificate/VaccinationDGCV1Parser.kt
      #	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/vaccination/core/qrcode/VaccinationQRCodeExtractor.kt
      #	Corona-Warn-App/src/main/res/values-bg/vaccination_strings.xml
      #	Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/common/qrcode/VaccinationQrCodeValidatorTest.kt
      #	Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/VaccinationQrCodeTestData.java
      #	Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/VaccinationTestComponent.kt
      #	Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/qrcode/VaccinationQRCodeExtractorTest.kt
      #	Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/vaccination/core/repository/storage/VaccinationContainerTest.kt
      #	gradle.properties
      71b65426
Loading