Merge branch '2014.11-develop' into 2015.07
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 28 Oct 2015 08:57:27 +0000 (09:57 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 28 Oct 2015 08:57:27 +0000 (09:57 +0100)
commit0fd8cea5431ac351c11d86de01a0e6c942795144
tree17f14ef07974fef63a12049b500c15186ad8b17d
parent4058cf92dc363291ed8480c551b67e704d4414d3
parenta3dc5ae6bb754cbca00b7d43cbef35a49019c2ab
Merge branch '2014.11-develop' into 2015.07

Conflicts:
tine20/Felamimail/Setup/Update/Release8.php

Change-Id: I8c61597148a125a2bcec1986fdb7564dbb7290ba
tine20/Calendar/js/Model.js
tine20/Felamimail/Setup/Update/Release8.php