Merge branch '2016.11' into 2016.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 8 Mar 2017 13:16:39 +0000 (14:16 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 8 Mar 2017 13:16:39 +0000 (14:16 +0100)
commitb49feef0e8c011871e40dea01534c65a945c0682
tree98c13a48d03ca0d6dc299ec6449533d6727be49b
parent8c2f6acdf298e1e393b1da572e2e61cd0791803b
parente9bb9fe58e86aa183f6e6cea1207c5c7c040a011
Merge branch '2016.11' into 2016.11-develop
tine20/Felamimail/Controller/Account.php
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/PickerGridPanel.js
tine20/Tinebase/js/widgets/relation/GenericPickerGridPanel.js
tine20/Tinebase/js/widgets/tags/TagsPanel.js