Merge branch '2015.11-develop' into 2016.11
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 10 Nov 2016 14:55:31 +0000 (15:55 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 10 Nov 2016 14:55:31 +0000 (15:55 +0100)
commit21bbd65d866eb9801da12fb454aac619f29687f3
tree185ee86ce83250e0f5b7d5a1414cb5866a52df57
parent671fc07cb38135b3e2e94377e74430c2fccdaebc
parenta5f3bbcac6602f891904c97120ba8fd2768e2f8b
Merge branch '2015.11-develop' into 2016.11
tests/tine20/Felamimail/Frontend/JsonTest.php
tine20/Tinebase/Mail.php