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

49604996

Commit 49604996 authored 3 years ago by Luka Harambasic

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/release/2.4.x' into release/2.5.x

# Conflicts:
#	gradle.properties

parents d4ee62bb 5549d03a

No related branches found

No related tags found

Loading

Changes 2

Hide whitespace changes

Inline Side-by-side

Showing

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/presencetracing/checkins/qrcode/QrCodeGenerator.kt 1 addition, 1 deletion

...arnapp/presencetracing/checkins/qrcode/QrCodeGenerator.kt
Corona-Warn-App/src/main/res/navigation/nav_graph.xml 1 addition, 1 deletion

Corona-Warn-App/src/main/res/navigation/nav_graph.xml

with 2 additions and 2 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