# Conflicts: # source/core/RemoteFiles.cpp # source/core/RemoteFiles.h Source commit: cc65c5415d0fcfcf72d5e93a818f9c598ec1f3b1
Martin Prikryl