Merge branch 'release/2.1.x' into release/2.2.x
# Conflicts: # gradle.properties
Showing
- Corona-Warn-App/src/main/res/layout/fragment_submission_no_consent_positive_other_warning.xml 27 additions, 18 deletions...fragment_submission_no_consent_positive_other_warning.xml
- Corona-Warn-App/src/main/res/layout/include_privacy_card_no_consent.xml 12 additions, 0 deletions...p/src/main/res/layout/include_privacy_card_no_consent.xml
- Corona-Warn-App/src/main/res/values-bg/antigen_strings.xml 2 additions, 2 deletionsCorona-Warn-App/src/main/res/values-bg/antigen_strings.xml
- Corona-Warn-App/src/main/res/values-de/antigen_strings.xml 2 additions, 2 deletionsCorona-Warn-App/src/main/res/values-de/antigen_strings.xml
- Corona-Warn-App/src/main/res/values-de/legal_strings.xml 5 additions, 3 deletionsCorona-Warn-App/src/main/res/values-de/legal_strings.xml
- Corona-Warn-App/src/main/res/values-de/strings.xml 12 additions, 4 deletionsCorona-Warn-App/src/main/res/values-de/strings.xml
- Corona-Warn-App/src/main/res/values-en/antigen_strings.xml 2 additions, 2 deletionsCorona-Warn-App/src/main/res/values-en/antigen_strings.xml
- Corona-Warn-App/src/main/res/values-pl/antigen_strings.xml 2 additions, 2 deletionsCorona-Warn-App/src/main/res/values-pl/antigen_strings.xml
- Corona-Warn-App/src/main/res/values-ro/antigen_strings.xml 2 additions, 2 deletionsCorona-Warn-App/src/main/res/values-ro/antigen_strings.xml
- Corona-Warn-App/src/main/res/values-tr/antigen_strings.xml 2 additions, 2 deletionsCorona-Warn-App/src/main/res/values-tr/antigen_strings.xml
- Corona-Warn-App/src/main/res/values-tr/legal_strings.xml 5 additions, 3 deletionsCorona-Warn-App/src/main/res/values-tr/legal_strings.xml
- Corona-Warn-App/src/main/res/values/antigen_strings.xml 2 additions, 2 deletionsCorona-Warn-App/src/main/res/values/antigen_strings.xml
- Corona-Warn-App/src/main/res/values/legal_strings.xml 5 additions, 3 deletionsCorona-Warn-App/src/main/res/values/legal_strings.xml
- Corona-Warn-App/src/main/res/values/strings.xml 11 additions, 0 deletionsCorona-Warn-App/src/main/res/values/strings.xml
Loading
Please register or sign in to comment