# Conflicts: # source/forms/CustomScpExplorer.cpp # source/windows/TerminalManager.cpp Source commit: c716189115860148cb38899fc36b67bca74e96f3
Martin Prikryl