Corona-Warn-App/src/androidTest/java/testhelpers/TestAppComponent.kt · 3a5c16a966fcf6a7aeac92135d37b812c712b0cb · Felix Foertsch / Cwa App Android

4 years ago

Merge branch 'release/1.15.x' into feature/5062-event-registration-main · cecb72e0

Matthias Urhahn authored 4 years ago

# Conflicts:
#	Corona-Warn-App/src/androidTest/java/testhelpers/TestAppComponent.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/files/FileSharing.kt
#	Corona-Warn-App/src/main/res/navigation/nav_graph.xml

cecb72e0

History

Merge branch 'release/1.15.x' into feature/5062-event-registration-main

Matthias Urhahn authored 4 years ago

# Conflicts:
#	Corona-Warn-App/src/androidTest/java/testhelpers/TestAppComponent.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/files/FileSharing.kt
#	Corona-Warn-App/src/main/res/navigation/nav_graph.xml

Code owners

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