Merge branch '2015.11' into 2016.11
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 19 Aug 2016 07:47:26 +0000 (09:47 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 19 Aug 2016 07:47:26 +0000 (09:47 +0200)
commit77265e60cc73300db029ae2c864a287bbe5cdff3
tree85be537854f182790e6dec253cf78dcfb6ae88ea
parent45dcd21e92e6beef300905b3bcb6b0291a4975ef
parentf073444eb54e4ff8591608ab0ebdb5542ab93f3b
Merge branch '2015.11' into 2016.11
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/User/ActiveDirectory.php