Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 18 May 2016 12:41:59 +0000 (14:41 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 18 May 2016 12:41:59 +0000 (14:41 +0200)
Conflicts:
tests/tine20/Tinebase/AllTests.php
tine20/Crm/Frontend/Json.php

Change-Id: I99e0f0468b7ce55a761cd43d69ca2479e513ca90

1  2 
tests/tine20/TestCase.php
tests/tine20/Tinebase/AllTests.php
tine20/Crm/Export/Pdf.php
tine20/Felamimail/Setup/setup.xml
tine20/Setup/Backend/Mysql.php
tine20/Setup/Controller.php
tine20/Tinebase/Ldap.php
tine20/Tinebase/User/ActiveDirectory.php
tine20/Tinebase/js/ExceptionHandler.js

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