Skip to content
Commit 16172a73 authored by Dmitriy Safronov's avatar Dmitriy Safronov
Browse files

Merge branch 'master' into 'new' 

# Conflicts:
#   Dockerfile
parents 83f89694 0d907a94