Skip to content
Snippets Groups Projects
Commit 2f0512b8 authored by Alexey Zhemchugov's avatar Alexey Zhemchugov
Browse files

Merge branch 'master' into 'development' 

# Conflicts:
#   .gitlab-ci.yml
parents 01ede3fb b0307015
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 2 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