Skip to content
Snippets Groups Projects
Commit 9468058d authored by Kolya Opahle's avatar Kolya Opahle
Browse files

Merge remote-tracking branch 'origin/release/1.10.x' into feature/4152-contact-diary 

# Conflicts:
#	Corona-Warn-App/src/main/res/values-de/contact_diary_strings.xml
#	Corona-Warn-App/src/main/res/values/contact_diary_strings.xml
parents 063442b6 e5afecbe
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 26 additions and 40 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment