Skip to content
Snippets Groups Projects
Commit 0040a273 authored by andrey.daragan's avatar andrey.daragan
Browse files

Merge branch 'develop' into 'feature-2894' 

# Conflicts:
#   widgets/DapButtonForm.ui.qml
#   widgets/DapComboBoxForm.ui.qml
parents 35158bf2 5773f522
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