Merge branch '2015.11-develop' into 2016.11
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 8 Nov 2016 13:57:23 +0000 (14:57 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 8 Nov 2016 13:57:23 +0000 (14:57 +0100)
commitca7e9626a358ffa72d913fba3df3f3816225475e
tree432160bb516139b3d9a37c727b8c8086444f15a5
parentbd026c6fbc8ed597dac445207f698e0525346cdb
parent9bbca64451ebf774e4381c29f6b73705b086c4fe
Merge branch '2015.11-develop' into 2016.11
tests/tine20/Felamimail/Frontend/JsonTest.php
tine20/Tinebase/Mail.php
tine20/composer.lock