Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

C

Cwa App Android
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

bb1a0e85

Commit bb1a0e85 authored 4 years ago by Matthias Urhahn

Downloads
- Plain Diff

Merge branch 'release/1.5.x' into fix/1.5.x-into-1.6.x

# Conflicts:
#	Corona-Warn-App/src/test/java/de/rki/coronawarnapp/diagnosiskeys/download/KeyFileDownloaderTest.kt

parents d8dadf4d 7be28dd8

No related branches found

No related tags found

Loading

Changes 8

Expand all Hide whitespace changes

Inline Side-by-side

Showing

CONTRIBUTING.md 1 addition, 21 deletions

CONTRIBUTING.md
Corona-Warn-App/build.gradle 1 addition, 1 deletion

Corona-Warn-App/build.gradle
Corona-Warn-App/src/main/assets/terms_de.html 22 additions, 22 deletions

Corona-Warn-App/src/main/assets/terms_de.html
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/diagnosiskeys/download/KeyFileDownloader.kt 13 additions, 2 deletions

...coronawarnapp/diagnosiskeys/download/KeyFileDownloader.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/diagnosiskeys/server/DiagnosisKeyServer.kt 1 addition, 1 deletion

.../coronawarnapp/diagnosiskeys/server/DiagnosisKeyServer.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/interoperability/InteroperabilityConfigurationFragment.kt 18 additions, 8 deletions

...interoperability/InteroperabilityConfigurationFragment.kt
Corona-Warn-App/src/test/java/de/rki/coronawarnapp/diagnosiskeys/download/KeyFileDownloaderTest.kt 189 additions, 236 deletions

...nawarnapp/diagnosiskeys/download/KeyFileDownloaderTest.kt
Corona-Warn-App/src/test/java/de/rki/coronawarnapp/diagnosiskeys/server/DiagnosisKeyServerTest.kt 37 additions, 14 deletions

...onawarnapp/diagnosiskeys/server/DiagnosisKeyServerTest.kt

with 282 additions and 305 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 sign in to comment