Merge branch 'master' of github.com:EGroupware/egroupware

This commit is contained in:
nathangray 2016-05-16 11:25:19 -06:00
commit 82aa64cc8b

View File

@ -142,9 +142,10 @@ module.exports = function (grunt) {
"api/js/etemplate/et2_widget_diff.js",
"api/js/etemplate/et2_widget_dropdown_button.js",
"api/js/etemplate/et2_widget_styles.js",
"api/js/etemplate/et2_widget_link.js",
"api/js/etemplate/et2_widget_selectAccount.js",
"api/js/jquery/magicsuggest/magicsuggest.js",
"api/js/etemplate/et2_widget_taglist.js",
"api/js/etemplate/et2_widget_link.js",
"api/js/etemplate/et2_extension_customfields.js",
"api/js/etemplate/et2_dataview_interfaces.js",
"api/js/etemplate/et2_dataview_view_container.js",
@ -180,7 +181,6 @@ module.exports = function (grunt) {
"api/js/etemplate/et2_widget_file.js",
"api/js/etemplate/et2_widget_progress.js",
"api/js/etemplate/et2_widget_portlet.js",
"api/js/etemplate/et2_widget_selectAccount.js",
"api/js/etemplate/et2_widget_ajaxSelect.js",
"api/js/etemplate/et2_widget_vfs.js",
"api/js/etemplate/et2_widget_video.js",