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
2 merge requests!226Added logging of information about the command to the Service.,!225Added logging of information about the command to the Service.
Hide whitespace changes
Inline Side-by-side
Showing
with 598 additions and 4 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