Merge remote-tracking branch 'upstream/3.1' into HOR-1087

This commit is contained in:
root
2016-06-06 08:33:07 -04:00
299 changed files with 16 additions and 22430 deletions

View File

@@ -228,8 +228,6 @@ class dynaformEditor extends WebResource
$G_PUBLISH->AddContent('panel-close');
$oHeadPublisher->addScriptFile("/js/maborak/core/maborak.loader.js",2);
$oHeadPublisher->addScriptFile('/jscore/dynaformEditor/core/dynaformEditor.js');
//$oHeadPublisher->addScriptFile('/js/dveditor/core/dveditor.js');
//$oHeadPublisher->addScriptFile('/codepress/codepress.js',1);
$oHeadPublisher->addScriptFile('/js/codemirrorOld/js/codemirror.js',1);