Skip to content
Snippets Groups Projects
Commit 2dcd35bc authored by Martin Juhás's avatar Martin Juhás
Browse files

Merge branch 'master' into 'develop'

# Conflicts:
#   VERSION.txt
parents 702f1f92 0a3246ff
No related branches found
No related tags found
3 merge requests!119Develop,!111Develop,!109Develop
Pipeline #181335 passed with stages
in 5 minutes and 59 seconds