feverfew updated this revision to Diff 73308. feverfew added a comment.
- Merge branch 'master' into arcpatch-D26191 - adhere to protcol -> json switch REPOSITORY R320 KIO Extras CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D26191?vs=73306&id=73308 BRANCH arcpatch-D26191 REVISION DETAIL https://phabricator.kde.org/D26191 AFFECTED FILES CMakeLists.txt sftp/kio_sftp.cpp sftp/kio_sftp.h sftp/sftp.protocol smb/kio_smb.cpp smb/kio_smb.h smb/kio_smb_file.cpp smb/smb.json To: feverfew, sitter, dfaure, fvogt Cc: kde-frameworks-devel, kfm-devel, ngraham, pberestov, iasensio, fprice, LeGast00n, MrPepe, fbampaloukas, alexde, GB_2, Codezela, feverfew, meven, michaelh, spoorun, navarromorales, firef, andrebarros, bruns, emmanuelp, mikesomov
