# Conflicts: # source/forms/CustomScpExplorer.cpp # source/forms/ScpCommander.cpp Source commit: 63402764772a477c5a2b1080664ba7c75f32ab89
Martin Prikryl