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
Hide whitespace changes
Inline Side-by-side
Showing
No files found.
with 0 additions and 0 deletions
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