Merge branch '2015.11-develop' into 2016.03
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 29 Apr 2016 10:29:14 +0000 (12:29 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 29 Apr 2016 10:29:14 +0000 (12:29 +0200)
commita83e306c76ae32346b6a29abcfc4434b8a955da9
tree85c5e17f1942720ab430d1d443009da4ec920668
parentefe0bcdfb37122836741911871f2bfb9d6e5bbb8
parent80231e61df76fabbcad760a4e02845ea956cb0ba
Merge branch '2015.11-develop' into 2016.03
tests/tine20/Felamimail/Frontend/JsonTest.php