Skip to content
GitLab
Explore
Sign in
PIM
KMailTransport
Repository
kmailtransport
src
transport.cpp
Find file
Blame
History
Permalink
Merge remote-tracking branch 'origin/KDE/4.14'
· 6a968cdb
Laurent Montel
authored
Nov 03, 2014
Conflicts: mailtransport/transport.cpp mailtransport/transportmanager.cpp
6a968cdb