Merge branch '2015.11-develop' into 2016.11
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 22 Dec 2016 12:09:06 +0000 (13:09 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 22 Dec 2016 12:09:06 +0000 (13:09 +0100)
1  2 
tests/tine20/Felamimail/Frontend/JsonTest.php
tine20/Tinebase/Controller.php

Simple merge