Merge branch 'release/2.0.x' into release/2.1.x
# Conflicts: # gradle.properties
Showing
- Corona-Warn-App/src/main/assets/default_app_config_android.bin 0 additions, 0 deletions...a-Warn-App/src/main/assets/default_app_config_android.bin
- Corona-Warn-App/src/main/assets/default_app_config_android.sha256 1 addition, 1 deletion...arn-App/src/main/assets/default_app_config_android.sha256
- Corona-Warn-App/src/main/assets/privacy_de.html 1 addition, 1 deletionCorona-Warn-App/src/main/assets/privacy_de.html
- Corona-Warn-App/src/main/assets/terms_de.html 1 addition, 1 deletionCorona-Warn-App/src/main/assets/terms_de.html
- Corona-Warn-App/src/main/assets/terms_en.html 1 addition, 1 deletionCorona-Warn-App/src/main/assets/terms_en.html
- Corona-Warn-App/src/main/assets/terms_tr.html 1 addition, 1 deletionCorona-Warn-App/src/main/assets/terms_tr.html
- Corona-Warn-App/src/main/res/values-bg/event_registration_strings.xml 16 additions, 0 deletions...App/src/main/res/values-bg/event_registration_strings.xml
- Corona-Warn-App/src/main/res/values-en/event_registration_strings.xml 16 additions, 0 deletions...App/src/main/res/values-en/event_registration_strings.xml
- Corona-Warn-App/src/main/res/values-pl/event_registration_strings.xml 16 additions, 0 deletions...App/src/main/res/values-pl/event_registration_strings.xml
- Corona-Warn-App/src/main/res/values-ro/event_registration_strings.xml 16 additions, 0 deletions...App/src/main/res/values-ro/event_registration_strings.xml
- Corona-Warn-App/src/main/res/values-tr/event_registration_strings.xml 16 additions, 0 deletions...App/src/main/res/values-tr/event_registration_strings.xml
- Corona-Warn-App/src/main/res/values/event_registration_strings.xml 6 additions, 5 deletions...rn-App/src/main/res/values/event_registration_strings.xml
- Corona-Warn-App/src/test/java/de/rki/coronawarnapp/appconfig/sources/fallback/DefaultAppConfigTest.kt 1 addition, 1 deletion...arnapp/appconfig/sources/fallback/DefaultAppConfigTest.kt
Loading
Please register or sign in to comment