Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

C

Cwa App Android
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

b6035c68

Commit b6035c68 authored 4 years ago by Matthias Urhahn

Downloads
- Plain Diff

Merge branch 'release/1.11.x' into release/1.12.x

parents 520aec8d 70da3ab2

No related branches found

No related tags found

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

Corona-Warn-App/src/main/AndroidManifest.xml 1 addition, 0 deletions

Corona-Warn-App/src/main/AndroidManifest.xml
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/ContactDiaryDayViewModel.kt 3 additions, 1 deletion

...nawarnapp/contactdiary/ui/day/ContactDiaryDayViewModel.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/backgroundpriority/SettingsBackgroundPriorityFragment.kt 1 addition, 1 deletion

.../backgroundpriority/SettingsBackgroundPriorityFragment.kt
Corona-Warn-App/src/main/res/layout/contact_diary_day_fragment.xml 1 addition, 0 deletions

...rn-App/src/main/res/layout/contact_diary_day_fragment.xml
Corona-Warn-App/src/main/res/layout/fragment_settings_background_priority.xml 2 additions, 1 deletion

...main/res/layout/fragment_settings_background_priority.xml
Corona-Warn-App/src/main/res/values-de/contact_diary_strings.xml 11 additions, 9 deletions

...Warn-App/src/main/res/values-de/contact_diary_strings.xml
Corona-Warn-App/src/main/res/values/contact_diary_strings.xml 2 additions, 0 deletions

...na-Warn-App/src/main/res/values/contact_diary_strings.xml
Corona-Warn-App/src/main/res/values/strings.xml 4 additions, 0 deletions

Corona-Warn-App/src/main/res/values/strings.xml

with 25 additions and 12 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment