Merge branch '2015.11-develop' into 2016.11
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 26 Oct 2016 12:46:53 +0000 (14:46 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 26 Oct 2016 12:46:53 +0000 (14:46 +0200)
commitcf1d0f7d8a363c1e72326eb836baad5e3986e462
treedf0ad0bae99f7e3bbaa6a2d5075c7ac60806e450
parent703641ff1d7482a5559d53fbb64e71fd59f6b4db
parenta12522e2e6422113a06ab7843d295fab2ab4b723
Merge branch '2015.11-develop' into 2016.11
tests/tine20/Felamimail/Frontend/JsonTest.php
tine20/Filemanager/Frontend/Json.php