Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 2 Sep 2016 11:52:10 +0000 (13:52 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 2 Sep 2016 11:52:10 +0000 (13:52 +0200)
commitba1b47528c86bc1910a8490af2e86c9d9d326c23
tree02e8170a0662f924089b0157d1d0c818539240ba
parentde4abfbc612c0b15f1a4a5fde6a131a5867bca79
parent985e506dc5201a55ba12ace4ce0216e6f82bba07
Merge branch '2015.11' into 2015.11-develop
tests/tine20/Felamimail/Frontend/JsonTest.php
tine20/Addressbook/Controller/Contact.php
tine20/Crm/Import/Csv.php
tine20/Sales/Setup/DemoData.php
tine20/Setup/Frontend/Cli.php
tine20/Tinebase/Config.php
tine20/Tinebase/Container.php
tine20/Tinebase/Controller/Record/Abstract.php
tine20/Tinebase/Import/Abstract.php
tine20/Tinebase/Setup/DemoData/Abstract.php
tine20/Tinebase/User/ActiveDirectory.php