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

2fb344bb

Commit 2fb344bb authored 4 years ago by Matthias Urhahn

Downloads
- Plain Diff

Merge branch 'release/1.8.x' into fix/merge-18x-into-19x-v2

# Conflicts:
#	gradle.properties

parents 6697cfb0 c20f7667

No related branches found

No related tags found

No related merge requests found

Changes 2

Hide whitespace changes

Inline Side-by-side

Showing

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/nearby/modules/diagnosiskeyprovider/DefaultDiagnosisKeyProvider.kt 1 addition, 0 deletions

...dules/diagnosiskeyprovider/DefaultDiagnosisKeyProvider.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/TracingRepository.kt 4 additions, 6 deletions

...in/java/de/rki/coronawarnapp/storage/TracingRepository.kt

with 5 additions and 6 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