Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 8 Mar 2017 13:16:11 +0000 (14:16 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 8 Mar 2017 13:16:11 +0000 (14:16 +0100)
commitd5235c11e725090310e94e5e1ac428a30d2b48ba
treeec83406d2c0491edefcdb6a6799e3b985988af35
parent5084e4a6192cc5943f6efa820ae1e0a69a558c05
parent6a478acd10ab065ebb0de3003f52f66c3936eeab
Merge branch '2015.11' into 2015.11-develop
tine20/Tinebase/js/widgets/ActivitiesGridPanel.js
tine20/Tinebase/js/widgets/dialog/AttachmentsGridPanel.js
tine20/Tinebase/js/widgets/grid/FileUploadGrid.js
tine20/Tinebase/js/widgets/grid/LinkGridPanel.js
tine20/Tinebase/js/widgets/grid/PickerGridPanel.js
tine20/Tinebase/js/widgets/relation/GenericPickerGridPanel.js
tine20/Tinebase/js/widgets/tags/TagsPanel.js