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

Merge branch 'release/2.0.x' into release/2.1.x 

# Conflicts:
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/submission/ui/homecards/SubmissionStateProvider.kt
#	gradle.properties
parents 3cc1ca61 2d996435
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
No files found.
with 0 additions and 0 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