Skip to content
Snippets Groups Projects
Commit 56b2a51e authored by Andrey Daragan's avatar Andrey Daragan
Browse files

Merge branch 'develop' into bugs-2893 

# Conflicts:
#	CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTopPanelForm.ui.qml
parents f4bfd6c0 3c5a3889
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
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