Merge branch '2016.11' into 2016.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 31 Jan 2017 14:54:28 +0000 (15:54 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 31 Jan 2017 14:54:28 +0000 (15:54 +0100)
1  2 
tests/tine20/Felamimail/Frontend/JsonTest.php
tine20/Addressbook/Config.php
tine20/Tinebase/Container.php
tine20/Tinebase/Import/Abstract.php
tine20/Tinebase/Relations.php
tine20/Tinebase/Timemachine/ModificationLog.php
tine20/Tinebase/User/Abstract.php

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge