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)
commitf4146467f45bd59d490b08ee561bd871527379f1
treeb1790f576deb96eeebab85a29dfd431180000508
parent9c91c90ace45ffce91d59519af5aa6f85b829d80
parenta34bdb7ae98d9400413e1ee4d36a6bad4d390ffa
Merge branch '2015.11-develop' into 2016.11
tests/tine20/Felamimail/Frontend/JsonTest.php
tine20/Tinebase/Controller.php