Merge branch 'STABLE-BRANCH-2-3'
authorAndre Heinecke <aheinecke@intevation.de>
Thu, 13 Sep 2018 09:14:30 +0000 (11:14 +0200)
committerAndre Heinecke <aheinecke@intevation.de>
Thu, 13 Sep 2018 09:14:30 +0000 (11:14 +0200)
1  2 
src/mail.cpp
src/windowmessages.cpp

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