Merge branch '2014.11-develop' into 2015.11
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 6 Jan 2016 14:57:27 +0000 (15:57 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 6 Jan 2016 14:57:27 +0000 (15:57 +0100)
commitefec13e5b5701075932da92b354395ef521b6055
treee5cacf00d7f088783325de12f9fc03998a135cd5
parentf26ee7d4e40e6a964392ea397909da38c3806f56
parent4cc15d2b1ee8bb3051d3c27ec3ee328fc00d6f9d
Merge branch '2014.11-develop' into 2015.11
tine20/Calendar/Controller/Event.php
tine20/Calendar/Controller/MSEventFacade.php
tine20/Calendar/Convert/Event/VCalendar/Abstract.php
tine20/Felamimail/Frontend/ActiveSync.php
tine20/Tinebase/Config/Abstract.php
tine20/Tinebase/Frontend/Http.php