# Conflicts: # source/filezilla/AsyncSslSocketLayer.cpp # source/resource/TextsCore.h # source/resource/TextsCore1.rc Source commit: 289c64ec975acf79c0c806d4d83d23c1ecf6541c
Martin Prikryl