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

Merge branch 'dev' into feature/interoperability

# Conflicts:
#	Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/RiskLevelAndKeyRetrievalBenchmark.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/http/WebRequestBuilder.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/keycache/KeyCacheDao.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/keycache/KeyCacheRepository.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransaction.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/CachedKeyFileHolder.kt
#	Corona-Warn-App/src/test/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransactionTest.kt
parents 0fa9457e 0ab2b010
No related branches found
No related tags found
No related merge requests found
Showing
with 235 additions and 51 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