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

Simple merge