Skip to content
Commit b8f2bff2 authored by Marek Vrbka's avatar Marek Vrbka
Browse files

Merge branch 'master' into 'FileManager' 

# Conflicts:
#   ConsoleFrontend/Program.cs
parents 02b0d9e1 469b39ef
Pipeline #133203 passed with stages
in 49 seconds