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)
commit5084e4a6192cc5943f6efa820ae1e0a69a558c05
tree46f31b4b4aa0cc5f08bfe01c4f7a36e7231dbb05
parentaaf50d6af709fe1d57ac897942fff68b86d07536
parentc5096f446a9672123ddb999fef609d7ec5e8f1bd
Merge branch '2015.11' into 2015.11-develop
tine20/Tinebase/js/ux/form/ImageField.js
tine20/Tinebase/js/widgets/persistentfilter/PickerPanel.js