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

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