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)
1  2 
tine20/Calendar/Frontend/Json.php
tine20/Calendar/js/Model.js
tine20/Filemanager/js/NodeGridPanel.js

Simple merge
Simple merge