Merge branch '2013.10' into 2014.11
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 11 Feb 2016 09:33:09 +0000 (10:33 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 11 Feb 2016 09:33:09 +0000 (10:33 +0100)
commit2854ad7b00fa69330309ebf408d3c1b0b3419841
tree326a64804fd7e9c3bbc777ae279e940bab2bcd8c
parent528535ed0dd0618d554ba9c8603dd4e261e7ccac
parentbf08a1d97a14f04d92e9332f7a55573eb014f5ce
Merge branch '2013.10' into 2014.11
tine20/Calendar/Frontend/Json.php
tine20/Calendar/js/Model.js
tine20/Filemanager/js/NodeGridPanel.js