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)
commit8daf90ecf46769e82d7aab327cc81ba9da47dd93
tree4d4cf553ae22e74ab146316f8dac27b151002b88
parentfb0139930564675d42c4b6f50b6bdcf3bdea746e
parent12e470b358c7a7f800a35389d003bbdcaaad5ab9
Merge branch '2016.11' into 2016.11-develop
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