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)
Change-Id: I3a03c3ed6ccaaefe98d45760b2ba99aedd1d2e61

1  2 
tests/tine20/Felamimail/Frontend/JsonTest.php
tests/tine20/Tinebase/Server/JsonTests.php
tine20/Tinebase/Config/KeyField.php
tine20/Tinebase/Setup/DemoData/Abstract.php

Simple merge