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

Merge branch 'release/1.7.x' into fix/merge-kerfuffle

# Conflicts:
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/notification/NotificationHelper.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/risk/DefaultRiskLevels.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/worker/BackgroundWorkHelper.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/worker/DiagnosisTestResultRetrievalPeriodicWorker.kt
#	gradle.properties
parents 7331d0f6 3ad97ffa
No related branches found
Tags v1.9.0-RC4
Loading
Showing
No files found.
with 0 additions and 0 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