Merge branch '2015.11' into 2016.11
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 29 Aug 2016 07:37:11 +0000 (09:37 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 29 Aug 2016 07:37:11 +0000 (09:37 +0200)
commit73d23c1b84cb7a7820ce50a679c2d34ef5e2f71a
tree3d8a6bc760f7e209362d0a0e8b71269bb9844fc9
parent8f617730c3e31d4514948139f877a94cbb69dd44
parent69ac45c7be512e513bcfc7f409affc5fc61d8cb3
Merge branch '2015.11' into 2016.11
tests/tine20/Felamimail/Frontend/JsonTest.php