Skip to content
Snippets Groups Projects
Commit 2b937819 authored by Matthias Urhahn's avatar Matthias Urhahn
Browse files

Merge branch 'release/1.8.x' into feature/3456-enfv2-main-branch

# Conflicts:
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/diagnosiskeys/download/DownloadDiagnosisKeysTask.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/nearby/ENFClient.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/nearby/modules/diagnosiskeyprovider/DefaultDiagnosisKeyProvider.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/receiver/ExposureStateUpdateReceiver.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/GoogleAPIVersion.kt
#	Corona-Warn-App/src/test/java/de/rki/coronawarnapp/nearby/ENFClientTest.kt
#	Corona-Warn-App/src/test/java/de/rki/coronawarnapp/nearby/modules/diagnosiskeyprovider/DefaultDiagnosisKeyProviderTest.kt
parents feeabf0d ad70358f
No related branches found
No related tags found
No related merge requests found
Showing
with 209 additions and 267 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 to comment