Merge branch '2014.11-develop' into 2015.07
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 10 Nov 2015 08:29:46 +0000 (09:29 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 10 Nov 2015 08:29:46 +0000 (09:29 +0100)
commit83fe82fbfa8bfb2156af4ad16b6ba4826fe0a4f8
tree3d60a4dfe2949e1feeb3d22ddd903e4428ecc2f8
parentf9ee93724ba2068949ff398181c75e5b7e35c858
parent83328b2480fb0058c4dfddb1e415f0fb69d4ec90
Merge branch '2014.11-develop' into 2015.07
tine20/Calendar/js/EventEditDialog.js
tine20/Calendar/js/Model.js
tine20/Tinebase/Application.php
tine20/Tinebase/Tinebase.jsb2
tine20/Tinebase/js/widgets/grid/GridPanel.js