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

56422390

Commit 56422390 authored 4 years ago by Matthias Urhahn

Downloads
- Plain Diff

Merge branch 'release/1.8.x' into fix/1.8.x-into-1.9.x

# Conflicts:
#	gradle.properties

parents 5e0a9a6d 68cff330

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/task/TaskController.kt 7 additions, 2 deletions

...src/main/java/de/rki/coronawarnapp/task/TaskController.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/tracing/card/TracingCardState.kt 12 additions, 22 deletions

.../de/rki/coronawarnapp/ui/tracing/card/TracingCardState.kt
Corona-Warn-App/src/test/java/de/rki/coronawarnapp/task/TaskControllerTest.kt 40 additions, 0 deletions

...test/java/de/rki/coronawarnapp/task/TaskControllerTest.kt
Corona-Warn-App/src/test/java/de/rki/coronawarnapp/task/testtasks/precondition/PreconditionTask.kt 53 additions, 0 deletions

...nawarnapp/task/testtasks/precondition/PreconditionTask.kt
Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/tracing/card/TracingCardStateTest.kt 42 additions, 0 deletions

...rki/coronawarnapp/ui/tracing/card/TracingCardStateTest.kt

with 154 additions and 24 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