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

Merge branch 'release/2.3.x' into release/2.4.x 

# Conflicts:
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/type/pcr/PCRProcessor.kt
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/coronatest/type/rapidantigen/RapidAntigenProcessor.kt
#	Corona-Warn-App/src/test/java/de/rki/coronawarnapp/coronatest/type/rapidantigen/RapidAntigenProcessorTest.kt
#	gradle.properties
parents e085adc3 e12bb057
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 306 additions and 216 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