Merge branch '2013.10' into 2014.11
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 28 May 2015 14:35:28 +0000 (16:35 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 28 May 2015 14:35:28 +0000 (16:35 +0200)
1  2 
tine20/Tinebase/Frontend/Http.php
tine20/Tinebase/js/widgets/grid/FileUploadGrid.js

Simple merge