Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 6 Mar 2017 12:33:05 +0000 (13:33 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 6 Mar 2017 12:33:05 +0000 (13:33 +0100)
1  2 
tine20/Tinebase/js/ux/form/ImageField.js
tine20/Tinebase/js/widgets/persistentfilter/PickerPanel.js