merge conflicts from 05.04

This commit is contained in:
Shailen Sobhee 2026-04-05 19:08:32 +02:00
parent 3271327208
commit 08bab05343

3
.gitignore vendored
View file

@ -15,4 +15,5 @@ build/
coredump_report.txt
coredump.bin
logs/
elf_archive/
elf_archive/
managed_components/