Explorar o código

Merge branch 'master' into dev

# Conflicts:
#	source/forms/CustomScpExplorer.cpp

Source commit: 7b9fc65e8db3d3a0c19ed21c87fb0ac8b5c044ae
Martin Prikryl %!s(int64=5) %!d(string=hai) anos
pai
achega
ac10541045

Os datos das diferenzas Diff non están dispoñibles.