Merge branch 'release/2.2.x' into release/2.3.x
# Conflicts: # gradle.properties
No related branches found
No related tags found
Showing
- CODEOWNERS 1 addition, 1 deletionCODEOWNERS
- Corona-Warn-App/src/main/assets/privacy_de.html 306 additions, 267 deletionsCorona-Warn-App/src/main/assets/privacy_de.html
- Corona-Warn-App/src/main/assets/privacy_en.html 313 additions, 256 deletionsCorona-Warn-App/src/main/assets/privacy_en.html
- Corona-Warn-App/src/main/assets/privacy_tr.html 123 additions, 130 deletionsCorona-Warn-App/src/main/assets/privacy_tr.html
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/exception/TransactionException.kt 0 additions, 21 deletions...va/de/rki/coronawarnapp/exception/TransactionException.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/deletionwarning/SubmissionDeletionWarningFragment.kt 48 additions, 107 deletions...sion/deletionwarning/SubmissionDeletionWarningFragment.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/deletionwarning/SubmissionDeletionWarningViewModel.kt 88 additions, 126 deletions...ion/deletionwarning/SubmissionDeletionWarningViewModel.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/qrcode/QrCodeRegistrationStateProcessor.kt 1 addition, 10 deletions.../ui/submission/qrcode/QrCodeRegistrationStateProcessor.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/tan/SubmissionTanViewModel.kt 0 additions, 8 deletions...coronawarnapp/ui/submission/tan/SubmissionTanViewModel.kt
- Corona-Warn-App/src/main/res/navigation/nav_graph.xml 2 additions, 2 deletionsCorona-Warn-App/src/main/res/navigation/nav_graph.xml
- Corona-Warn-App/src/main/res/values-de/antigen_strings.xml 1 addition, 1 deletionCorona-Warn-App/src/main/res/values-de/antigen_strings.xml
- Corona-Warn-App/src/main/res/values-de/legal_strings.xml 3 additions, 2 deletionsCorona-Warn-App/src/main/res/values-de/legal_strings.xml
- Corona-Warn-App/src/main/res/values-de/strings.xml 4 additions, 4 deletionsCorona-Warn-App/src/main/res/values-de/strings.xml
- Corona-Warn-App/src/main/res/values-tr/legal_strings.xml 1 addition, 1 deletionCorona-Warn-App/src/main/res/values-tr/legal_strings.xml
- Corona-Warn-App/src/main/res/values/legal_strings.xml 1 addition, 1 deletionCorona-Warn-App/src/main/res/values/legal_strings.xml
- Corona-Warn-App/src/test/java/de/rki/coronawarnapp/coronatest/type/pcr/PCRCoronaTestTest.kt 25 additions, 0 deletions...ki/coronawarnapp/coronatest/type/pcr/PCRCoronaTestTest.kt
- Corona-Warn-App/src/test/java/de/rki/coronawarnapp/coronatest/type/rapidantigen/RACoronaTestTest.kt 26 additions, 0 deletions...awarnapp/coronatest/type/rapidantigen/RACoronaTestTest.kt
- README.md 0 additions, 10 deletionsREADME.md
- gradle.properties 1 addition, 1 deletiongradle.properties
Loading
Please register or sign in to comment