Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 2 Aug 2017 11:33:21 +0000 (13:33 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 2 Aug 2017 11:33:21 +0000 (13:33 +0200)
1  2 
tests/tine20/Crm/JsonTest.php
tine20/Tinebase/Relations.php

Simple merge
Simple merge