Merge branch '2015.11-develop' into 2016.11
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 2 Sep 2016 11:56:58 +0000 (13:56 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 2 Sep 2016 11:56:58 +0000 (13:56 +0200)
commit00e9b5a69dd9d7b8a099eabea84a1775ef6e883a
tree9e68c18176aa335c50c2b7b3a0d8a3b819975eec
parent02019502ec4b7685e57568a1131061af755eba44
parentba1b47528c86bc1910a8490af2e86c9d9d326c23
Merge branch '2015.11-develop' into 2016.11

Change-Id: I3a03c3ed6ccaaefe98d45760b2ba99aedd1d2e61
tests/tine20/Felamimail/Frontend/JsonTest.php
tests/tine20/Tinebase/Server/JsonTests.php
tine20/Tinebase/Config/KeyField.php
tine20/Tinebase/Setup/DemoData/Abstract.php