Skip to content
Snippets Groups Projects
Commit 39642d49 authored by Matthias Feyll's avatar Matthias Feyll :cookie:
Browse files

ui: resolve merge conflicts

parents 72bb539e 7519056f
Branches ui-add-device
No related tags found
2 merge requests!1196[renovate] Update module golang.org/x/net to v0.32.0,!1195UI: implement add device functionality
Pipeline #259790 passed
Status
Pipeline
Created by
Stages
Actions
Passed

00:11:57

avatar
Download artifacts

No artifacts found

Failed

00:07:27

avatar
Download artifacts

No artifacts found

Passed

00:10:37

avatar
Download artifacts

No artifacts found