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

Merge branch 'release/1.14.x' into feature/4741-contact-journal-extension-main

# Conflicts:
#	Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/menu/ui/TestMenuFragmentViewModel.kt
#	Corona-Warn-App/src/deviceForTesters/res/navigation/test_nav_graph.xml
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/ContactDiaryDayViewModel.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/util/ContactDiaryExtensions.kt
#	Corona-Warn-App/src/main/res/navigation/contact_diary_nav_graph.xml
#	Corona-Warn-App/src/main/res/values-de/contact_diary_strings.xml
#	Corona-Warn-App/src/main/res/values-de/strings.xml
#	Corona-Warn-App/src/main/res/values/contact_diary_strings.xml
#	Corona-Warn-App/src/main/res/values/strings.xml
parents c3f180ea 47f39c11
No related branches found
No related tags found
No related merge requests found
Showing
with 267 additions and 63 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