Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 12 Sep 2016 12:19:22 +0000 (14:19 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 12 Sep 2016 12:19:22 +0000 (14:19 +0200)
commit8b216b5df8fb8b429e7bf66cc5ffa4b8eb65dd68
tree40513d07ac8f8f95a05c0a614a71dc546a30e2a0
parent23a906dbf64837aab8efab5b75be3c974b30df6c
parent662c2a3b775f055d4dadb33c9ebe57eb45aaff54
Merge branch '2015.11' into 2015.11-develop
tine20/Tinebase/Convert/Json.php