Skip to content
Snippets Groups Projects
Commit 013d86d4 authored by dwf1m12's avatar dwf1m12
Browse files

Merge branch 'main' into 'main'

# Conflicts:
#   .gitlab-ci.yml
#   system/testcodes/software_list.txt
parents 4f493d01 13c283cd
No related branches found
No related tags found
No related merge requests found
Pipeline #10268 passed