-
Laurent Montel authored
Conflicts: resources/CMakeLists.txt resources/imap/CMakeLists.txt resources/imap/imapresource.cpp resources/imap/imapresource.h resources/kolab/CMakeLists.txt
748d935d
Conflicts: resources/CMakeLists.txt resources/imap/CMakeLists.txt resources/imap/imapresource.cpp resources/imap/imapresource.h resources/kolab/CMakeLists.txt