Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 8 Dec 2016 13:00:42 +0000 (14:00 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 8 Dec 2016 13:00:42 +0000 (14:00 +0100)
commit86b20e7a524a09b316b68e84129235e3d30c8fdf
treef1ca23fce91076383e729fc9bf9958a8518cc006
parent234c8643fadb40167d16198b91dfc9383ab36760
parent1c0ef17593a5fcb98fbce70048af54f23d0c7e0c
Merge branch '2015.11' into 2015.11-develop

Change-Id: I4017e78c3d4d0e7240e753fe8a59a944bf854d0d
tine20/Calendar/js/Model.js
tine20/Sales/Setup/setup.xml
tine20/Setup/Backend/Mysql.php
tine20/Tinebase/Container.php
tine20/Tinebase/Setup/Update/Release9.php
tine20/Tinebase/Setup/setup.xml
tine20/Tinebase/js/widgets/grid/FileUploadGrid.js