Merge branch 'STABLE-BRANCH-2-3'
authorAndre Heinecke <aheinecke@intevation.de>
Thu, 6 Sep 2018 15:35:22 +0000 (17:35 +0200)
committerAndre Heinecke <aheinecke@intevation.de>
Thu, 6 Sep 2018 15:35:22 +0000 (17:35 +0200)
--
 Conflicts:
src/common.h
src/mail.cpp
src/windowmessages.cpp

1  2 
src/mail.cpp
src/mailitem-events.cpp
src/ribbon-callbacks.cpp
src/windowmessages.cpp

diff --cc src/mail.cpp
Simple merge
Simple merge
Simple merge
Simple merge