Corona-Warn-App/build.gradle · 660085c8d85062ac4951fc8fcfb6bcaf9d1e974d · Felix Foertsch / Cwa App Android

4 years ago

Merge branch 'release/1.5.x' into feature/interoperability · 660085c8

Matthias Urhahn authored 4 years ago

# Conflicts:
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/fragment/SubmissionQRCodeScanFragment.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/fragment/SubmissionResultPositiveOtherWarningFragment.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/fragment/SubmissionTanFragment.kt

660085c8

History

Merge branch 'release/1.5.x' into feature/interoperability

Matthias Urhahn authored 4 years ago

# Conflicts:
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/fragment/SubmissionQRCodeScanFragment.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/fragment/SubmissionResultPositiveOtherWarningFragment.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/fragment/SubmissionTanFragment.kt

Code owners

Assign users and groups as approvers for specific file changes. Learn more.