Explorar o código

Merge branch 'master' into dev

# Conflicts:
#	source/core/SecureShell.cpp

Source commit: beafb1492dd130e040fc43cc8b8f6185e1d306f9
Martin Prikryl %!s(int64=5) %!d(string=hai) anos
pai
achega
9e430447e4

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