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)
1  2 
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

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge