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)
commit1e37769baa280cef9c5519fed444f872d988154f
tree47da97c014af972c9c58c0d889c93b65a1175e63
parent83ec3e48ee4f3c596fd6dde2e19a4bdb61b813f1
parent6da36d472a86125dae10c8873179ee14f288f04e
Merge branch '2013.10' into 2014.11
tine20/Tinebase/Frontend/Http.php
tine20/Tinebase/js/widgets/grid/FileUploadGrid.js