Merge branch '2016.11' into 2016.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 8 Nov 2016 14:00:05 +0000 (15:00 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 8 Nov 2016 14:00:05 +0000 (15:00 +0100)
commit6afea10ba901bb4fdf2cecd2759596291fc4f6e2
treec70888870d533d77ac85227773d04cd5cb067a6f
parentfd31539f048d8f62ece890436ba1aba544034a1c
parentca7e9626a358ffa72d913fba3df3f3816225475e
Merge branch '2016.11' into 2016.11-develop

Change-Id: I914c6723915844e354444aad3c34732f433cca2d
tests/tine20/AllTests.php
tests/tine20/Felamimail/Frontend/JsonTest.php
tests/tine20/Filemanager/Frontend/JsonTests.php
tests/tine20/TestCase.php
tests/tine20/Tinebase/ApplicationTest.php
tine20/Felamimail/Message.php
tine20/Filemanager/Controller/Node.php
tine20/Tinebase/Controller/Record/Abstract.php
tine20/Tinebase/CustomField.php
tine20/Tinebase/FileSystem.php
tine20/Tinebase/Record/DoctrineMappingDriver.php