Merge branch '2015.11-develop' into 2016.11
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 22 Nov 2016 10:41:23 +0000 (11:41 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 22 Nov 2016 10:41:23 +0000 (11:41 +0100)
commit56a6681d9c5034b2128b1bd0e7958340bcf4d42e
tree16c8413e65dcd8bb3f117e4eaaee4b278da37757
parent1ceab8903fabf9ed9ccf4da366f22848a5bbdca3
parent2b3bf5f93d48be1208ffe46785536b62d43fece3
Merge branch '2015.11-develop' into 2016.11
tests/tine20/Felamimail/Frontend/JsonTest.php
tine20/Felamimail/translations/de.po
tine20/Felamimail/translations/template.pot
tine20/Tinebase/Mail.php