Merge branch '2014.11-develop' into 2015.07
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 5 Aug 2015 17:55:05 +0000 (19:55 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 5 Aug 2015 17:55:05 +0000 (19:55 +0200)
commit92155f06503edd61e40666df387552ebf776ebcd
tree29bf4177c05ffc65beaa15bc1acb86d77cb6383c
parenta48d6fb75f7d16c3ecbb69c1207553770ca38a1a
parent34731d5983fbe8508f45ee67b9b8ccc3000895e6
Merge branch '2014.11-develop' into 2015.07

Conflicts:
tine20/Tinebase/Core.php

Change-Id: I63ac802ba46cd9cfc04c8b50f28b24c729cc9cfe
tine20/Calendar/Setup/Update/Release8.php
tine20/Calendar/js/MainScreenCenterPanel.js
tine20/Tinebase/Core.php