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)
1  2 
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

Simple merge
Simple merge
Simple merge