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)
Conflicts:
tests/tine20/Felamimail/Frontend/JsonTest.php

Change-Id: I4be47eac71391299ad92c93069e4b6ac3161d6da

1  2 
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

Simple merge
Simple merge
Simple merge