-
Laurent Montel authored
Conflicts: agents/mailfilteragent/akonadi_mailfilter_agent.notifyrc calendarviews/prefs.cpp calendarviews/prefs.h kalarm/wakedlg.cpp messagecore/autotests/attachmentparttest.cpp messagecore/autotests/attachmentparttest.h
b53181b5