Skip to content
Snippets Groups Projects
Commit 18f204f8 authored by Alexandr Mruchok's avatar Alexandr Mruchok
Browse files

Merge branch 'master' into feature-4584 

# Conflicts:
#	CellFrameDashboardGUI/qml.qrc
parents ef3210d3 396d3dac
No related branches found
No related tags found
1 merge request!11Cellframe clone
Hide whitespace changes
Inline Side-by-side
cellframe-ui-sdk @ d9c7a081
Compare 2d275931...d9c7a081
Subproject commit 2d2759312365ec355e82384c3fb8ccf64ca9abfa
Subproject commit d9c7a081eea35af0f4c3f373f3b4d51c1202d4ae
dap-ui-sdk @ ac371d6c
Compare 1e3fc3ce...ac371d6c
Subproject commit 1e3fc3ce8fb483d15f2c210cf6bbd7a7b8731edd
Subproject commit ac371d6c6a4b019f5306faaa2c39ab09450bc845
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment