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)
1  2 
tests/tine20/Addressbook/JsonTest.php
tine20/Calendar/Frontend/Json.php

Simple merge
Simple merge