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

Merge branch 'master' into bugs-2797 

# Conflicts:
#	libdap-qt-ui-qml
parents 79e3bf06 1fcce308
No related branches found
No related tags found
1 merge request!65Bugs 2797
Pipeline #1464 passed with stage
Stage: build
    in 19 minutes and 59 seconds