Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 9 May 2016 12:02:12 +0000 (14:02 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 9 May 2016 12:02:12 +0000 (14:02 +0200)
1  2 
tests/tine20/Filemanager/Frontend/JsonTests.php
tests/tine20/TestCase.php
tine20/Crm/js/Model.js
tine20/Tinebase/Controller/Record/Abstract.php
tine20/Tinebase/Record/RecordSet.php
tine20/Tinebase/Relations.php

Simple merge
Simple merge
Simple merge
Simple merge