Merge branch '2015.11-develop' into 2016.03
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 21 Apr 2016 07:59:13 +0000 (09:59 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 21 Apr 2016 07:59:13 +0000 (09:59 +0200)
commit2cf103e1586e4d2ee77db9571740bce2324d4328
tree5c3fa6eed28f96ef1b746779cbaa5385c5fffa3e
parent4a7eb396712e8a1fccd97b25afc30ad5a7f4876b
parent902c8b302c8c4da895e2b0a6e9f51b1bcbc2afa3
Merge branch '2015.11-develop' into 2016.03

Conflicts:
tests/tine20/Felamimail/Frontend/JsonTest.php

Change-Id: I4be47eac71391299ad92c93069e4b6ac3161d6da
tests/tine20/Tasks/JsonTest.php
tests/tine20/Timetracker/JsonTest.php
tine20/Felamimail/Controller/Message.php
tine20/Tinebase/Setup/DemoData/Abstract.php
tine20/Tinebase/js/tineInit.js