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

694dd3bb

Commit 694dd3bb authored 4 years ago by chris-cwa

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/release/1.6.x' into 1.6_to_1.7

# Conflicts:
#	gradle.properties

parents 45cacb0f 6ad9ff89

No related branches found

No related tags found

Loading

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/LocalData.kt 3 additions, 4 deletions

...p/src/main/java/de/rki/coronawarnapp/storage/LocalData.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/home/HomeFragment.kt 2 additions, 2 deletions

...in/java/de/rki/coronawarnapp/ui/main/home/HomeFragment.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/home/HomeFragmentViewModel.kt 9 additions, 5 deletions

...e/rki/coronawarnapp/ui/main/home/HomeFragmentViewModel.kt
Corona-Warn-App/src/main/res/values-bg/strings.xml 28 additions, 2 deletions

Corona-Warn-App/src/main/res/values-bg/strings.xml
Corona-Warn-App/src/main/res/values-en/strings.xml 28 additions, 2 deletions

Corona-Warn-App/src/main/res/values-en/strings.xml
Corona-Warn-App/src/main/res/values-pl/strings.xml 28 additions, 2 deletions

Corona-Warn-App/src/main/res/values-pl/strings.xml
Corona-Warn-App/src/main/res/values-ro/strings.xml 28 additions, 2 deletions

Corona-Warn-App/src/main/res/values-ro/strings.xml
Corona-Warn-App/src/main/res/values-tr/strings.xml 28 additions, 2 deletions

Corona-Warn-App/src/main/res/values-tr/strings.xml
Corona-Warn-App/src/main/res/values/strings.xml 11 additions, 11 deletions

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

with 165 additions and 32 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