Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 10 Nov 2016 14:55:25 +0000 (15:55 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 10 Nov 2016 14:55:25 +0000 (15:55 +0100)
commita5f3bbcac6602f891904c97120ba8fd2768e2f8b
tree6a5008f74d55adf9b28cd6de52bc17d45c39bd70
parent57ecfa9e15dc2cb3d4354ad53c7d608935e55b8c
parent750b3635c697b32ab6ba0d2baf12944dcb06e33b
Merge branch '2015.11' into 2015.11-develop
tests/tine20/Felamimail/Frontend/JsonTest.php
tine20/Addressbook/js/Model.js
tine20/Felamimail/Controller/Message/Send.php
tine20/Felamimail/Model/Message.php
tine20/Tinebase/Mail.php