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

b5e38763

Commit b5e38763 authored 4 years ago by Matthias Urhahn

Downloads
- Plain Diff

Merge branch 'release/1.15.x' into chore/DEV-merge-1.5.x-into-2.0.x

# Conflicts:
#	Corona-Warn-App/src/main/res/values/strings.xml
#	gradle.properties

parents d7306206 12f453c9

No related branches found

No related tags found

No related merge requests found

Changes 65

Hide whitespace changes

Inline Side-by-side

Showing

Corona-Warn-App/src/test/java/de/rki/coronawarnapp/storage/SubmissionRepositoryTest.kt 58 additions, 4 deletions

.../de/rki/coronawarnapp/storage/SubmissionRepositoryTest.kt
Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/encryptionmigration/EncryptedPreferencesMigrationTest.kt 165 additions, 0 deletions

.../encryptionmigration/EncryptedPreferencesMigrationTest.kt
Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/security/EncryptedPreferencesFactoryTest.kt 1 addition, 0 deletions

...awarnapp/util/security/EncryptedPreferencesFactoryTest.kt
Corona-Warn-App/src/test/java/de/rki/coronawarnapp/worker/DiagnosisTestResultRetrievalPeriodicWorkerTest.kt 2 additions, 2 deletions

.../worker/DiagnosisTestResultRetrievalPeriodicWorkerTest.kt
README.md 17 additions, 12 deletions

README.md

with 243 additions and 18 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