Skip to content
Snippets Groups Projects
Commit f5990031 authored by alexey.stratulat's avatar alexey.stratulat
Browse files

Merge branch 'master' into release-1.1 

# Conflicts:
#	explorer.py
parents b04ffb9e f5cb84aa
No related branches found
No related tags found
1 merge request!21release-1.1
Pipeline #17577 passed with stage
in 15 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