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

Merge branch 'master' into fix/master-into-1.4.x

# Conflicts:
#	Corona-Warn-App/build.gradle
#	Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/TestForAPIFragment.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/CoronaWarnApplication.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/transaction/RetrieveDiagnosisKeysTransaction.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/worker/DiagnosisKeyRetrievalOneTimeWorker.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/worker/DiagnosisKeyRetrievalPeriodicWorker.kt
#	Corona-Warn-App/src/main/res/values-bg/strings.xml
#	Corona-Warn-App/src/main/res/values-de/strings.xml
#	Corona-Warn-App/src/main/res/values-en/strings.xml
#	Corona-Warn-App/src/main/res/values-pl/strings.xml
#	Corona-Warn-App/src/main/res/values-ro/strings.xml
#	Corona-Warn-App/src/main/res/values-tr/strings.xml
#	Corona-Warn-App/src/main/res/values/strings.xml
parents 7ff340f6 8913e9a9
No related branches found
No related tags found
No related merge requests found
Showing
No files found.
with 0 additions and 0 deletions
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