Merge branch '2015.11-sambaad' into 2015.11
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 19 Apr 2016 13:13:06 +0000 (15:13 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 19 Apr 2016 13:13:06 +0000 (15:13 +0200)
commitbd01f4a39b9e9b0a50a07fd2dec42819a93a8880
tree1ce5d3386043e946b9125fb702e0a38c2566f5ee
parent1c8a10fe5ed36419a5ec562f09487ed4e2979ffd
parentec25f8adca76fbae51bd8a46ecb7e255473535dc
Merge branch '2015.11-sambaad' into 2015.11
tests/tine20/Calendar/Controller/EventTests.php
tests/tine20/Calendar/Convert/Event/VCalendar/GenericTest.php