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)
commit1f6ad90ce902d95b11efcf82301e2bcd5e1d22c5
treef5cee74225e5274a78e9d0c530dc54956ad1f953
parentd3943431bb2167957d5aa003dfa9ebc67c90ee0c
parent2e44e19ac41e73b0cba0995ba2d1ad0c0c015e03
Merge branch '2015.11' into 2015.11-develop
tests/tine20/Crm/JsonTest.php
tine20/Tinebase/Relations.php