Merge branch '2016.11' into 2016.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 14 Feb 2017 17:57:16 +0000 (18:57 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 14 Feb 2017 17:57:16 +0000 (18:57 +0100)
commitbbdd9b8e1f8d16ed445747cf43a315a295c645df
tree3588d9ea11e6cb9c14626e1f86bbb7a411d53682
parentbeb68bec58b6792c018a7f366427be430b26f4fc
parente9e112e8608c1f044dd32e263fdc48da41e90682
Merge branch '2016.11' into 2016.11-develop

Change-Id: I627221fb0298a34fc3b65256ecf8b7b2dfb652b6
tests/tine20/Felamimail/Frontend/JsonTest.php
tine20/Addressbook/Controller/Contact.php
tine20/Tinebase/Core.php
tine20/Tinebase/Helper.php
tine20/composer.lock