Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 22 Nov 2016 10:41:13 +0000 (11:41 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 22 Nov 2016 10:41:13 +0000 (11:41 +0100)
commit2b3bf5f93d48be1208ffe46785536b62d43fece3
treecb6bb5f15cfa758f5056a4ec165e72dd609413dd
parent54ec4c888466364e3a05da72e3fb1ebd361a93a7
parent008a710da16e2ec13ab604262b4cd1abf793ef99
Merge branch '2015.11' into 2015.11-develop
tests/tine20/Felamimail/Frontend/JsonTest.php
tine20/Felamimail/Controller/Message/Send.php
tine20/Felamimail/Model/Message.php
tine20/Felamimail/translations/de.po
tine20/Tinebase/Mail.php