Skip to content
Snippets Groups Projects
Commit d35f048e authored by littletux89@gmail.com's avatar littletux89@gmail.com
Browse files

Merge branch 'develop' into bugs-2893 

# Conflicts:
#	widgets/DapButtonForm.ui.qml
#	widgets/DapComboBoxForm.ui.qml
#	widgets/DapRadioButton.qml
#	widgets/DapRadioButtonForm.ui.qml
parents d63a06e0 8fc19dd0
No related branches found
No related tags found
This commit is part of merge request !11. Comments created here will be created in the context of that merge request.
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