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

053303c9

Commit 053303c9 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/build.gradle
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/MainFragment.kt

parents 0f6b440a 75e9312a

No related branches found

No related tags found

Loading

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/errors/RecoveryByResetDialogFactory.kt 10 additions, 7 deletions

...coronawarnapp/util/errors/RecoveryByResetDialogFactory.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/security/EncryptionErrorResetTool.kt 2 additions, 2 deletions

...i/coronawarnapp/util/security/EncryptionErrorResetTool.kt
Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/security/EncryptionResetToolTest.kt 82 additions, 0 deletions

...ki/coronawarnapp/util/security/EncryptionResetToolTest.kt

with 94 additions and 9 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