Merge branch '2015.11' into 2015.11-develop

author Philipp Schüle <p.schuele@metaways.de>

Wed, 8 Mar 2017 13:16:11 +0000 (14:16 +0100)

committer Philipp Schüle <p.schuele@metaways.de>

Wed, 8 Mar 2017 13:16:11 +0000 (14:16 +0100)
author Philipp Schüle <p.schuele@metaways.de>
Wed, 8 Mar 2017 13:16:11 +0000 (14:16 +0100)
committer Philipp Schüle <p.schuele@metaways.de>
Wed, 8 Mar 2017 13:16:11 +0000 (14:16 +0100)
diff --cc tine20/Tinebase/js/widgets/ActivitiesGridPanel.js
Simple merge
diff --cc tine20/Tinebase/js/widgets/dialog/AttachmentsGridPanel.js
Simple merge
diff --cc tine20/Tinebase/js/widgets/grid/FileUploadGrid.js
Simple merge
diff --cc tine20/Tinebase/js/widgets/grid/LinkGridPanel.js
Simple merge
diff --cc tine20/Tinebase/js/widgets/grid/PickerGridPanel.js
Simple merge
diff --cc tine20/Tinebase/js/widgets/relation/GenericPickerGridPanel.js
Simple merge
diff --cc tine20/Tinebase/js/widgets/tags/TagsPanel.js
Simple merge
author	Philipp Schüle <p.schuele@metaways.de>
	Wed, 8 Mar 2017 13:16:11 +0000 (14:16 +0100)
committer	Philipp Schüle <p.schuele@metaways.de>
	Wed, 8 Mar 2017 13:16:11 +0000 (14:16 +0100)
		1	2
tine20/Tinebase/js/widgets/ActivitiesGridPanel.js	patch \|	diff1 \|	diff2 \|	blob \| history
tine20/Tinebase/js/widgets/dialog/AttachmentsGridPanel.js	patch \|	diff1 \|	diff2 \|	blob \| history
tine20/Tinebase/js/widgets/grid/FileUploadGrid.js	patch \|	diff1 \|	diff2 \|	blob \| history
tine20/Tinebase/js/widgets/grid/LinkGridPanel.js	patch \|	diff1 \|	diff2 \|	blob \| history
tine20/Tinebase/js/widgets/grid/PickerGridPanel.js	patch \|	diff1 \|	diff2 \|	blob \| history
tine20/Tinebase/js/widgets/relation/GenericPickerGridPanel.js	patch \|	diff1 \|	diff2 \|	blob \| history
tine20/Tinebase/js/widgets/tags/TagsPanel.js	patch \|	diff1 \|	diff2 \|	blob \| history