Merge branch '2016.11' into 2016.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 13 Jun 2017 13:55:17 +0000 (15:55 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 13 Jun 2017 13:55:17 +0000 (15:55 +0200)
commit0d120da9f6c4da71ec6ab8882d113d9713eac03f
tree8d7a6cbd683d6771ae45aedbfcff997814148f0f
parent6968687cb4c90bdc4754193656bacaf6532993c2
parentdcfbcbd63bd6a4a76e2d5c9d519a4dde32857141
Merge branch '2016.11' into 2016.11-develop

Change-Id: I91ed04756eede4c56b96cf02934a4d7c1d449ed0
tests/tine20/Crm/JsonTest.php
tests/tine20/Felamimail/Controller/MessageTest.php
tine20/Felamimail/Controller/Message.php
tine20/Tinebase/Frontend/Cli.php
tine20/Tinebase/Relations.php
tine20/Tinebase/Setup/Update/Release9.php