Merge branch '2015.11-develop' into 2016.11
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 14 Nov 2016 11:51:06 +0000 (12:51 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 14 Nov 2016 11:51:06 +0000 (12:51 +0100)
commit13cacc4458547168d1a374305c7f83fe5a752fdf
tree2b0d849ca5ee98617cd650ab22d9f4d082593a56
parent21bbd65d866eb9801da12fb454aac619f29687f3
parent486a94738a43ceb2ebddb4e72d6c12dc3a3a7663
Merge branch '2015.11-develop' into 2016.11
tests/tine20/Addressbook/JsonTest.php
tine20/Calendar/Frontend/Json.php