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

Merge remote-tracking branch 'origin/features-4203-gui' 

# Conflicts:
#	CellFrameDashboardGUI/qml.qrc
parents a0e45bfb 5f0bf3d2
No related branches found
No related tags found
1 merge request!11Cellframe clone
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 889 additions and 5 deletions
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