Skip to content
Snippets Groups Projects
Commit 3964aa96 authored by Kirill Anisimov's avatar Kirill Anisimov
Browse files

Merge branch 'develop' into 'features-3030' 

Conflicts:
  libdap-qt-ui-qml.qrc
parents d704012b 5b93902e
No related branches found
No related tags found
This commit is part of merge request !22. 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