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

Merge branch 'release/1.13.x' into feature/4321-ppa-main 

# Conflicts:
#	Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/datadonation/ui/DataDonationTestFragment.kt
#	Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/datadonation/ui/DataDonationTestFragmentViewModel.kt
#	Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_datadonation.xml
parents b0800290 d0a8c157
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 629 additions and 29 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