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)
commit1cefdea05092b68a3db0c6eaa32341c3123f9f37
tree890a2eaca1fef84891245594c52625f6de594236
parent8fb3524262283c77a91f7e6c615d97f426455332
parent2da40322c2614a3357eac901f970c96cb1c17dbe
Merge branch 'STABLE-BRANCH-2-3'

--
 Conflicts:
src/common.h
src/mail.cpp
src/windowmessages.cpp
src/mail.cpp
src/mailitem-events.cpp
src/ribbon-callbacks.cpp
src/windowmessages.cpp