backup/ROC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into es17.01

Browse Source 
# Conflicts:
#	modules/node/node-safe.ecf
This commit is contained in:
Jocelyn FIAT
2017-03-03 13:17:31 +01:00
parent b62d42db07 bb25a8b12e
commit 18424e6db7
7 changed files with 156 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
modules/node/node.ecf
View File

@@ -17,6 +17,7 @@
<library name="cms_sitemap_module" location="..\..\modules\sitemap\sitemap.ecf" readonly="false"/>
<library name="cms_taxonomy_module" location="..\..\modules\taxonomy\taxonomy.ecf" readonly="false"/>
<library name="error" location="$ISE_LIBRARY\contrib\library\utility\general\error\error.ecf"/>
<library name="feed" location="$ISE_LIBRARY\contrib\library\text\parser\feed\feed.ecf"/>
<library name="http" location="$ISE_LIBRARY\contrib\library\network\protocol\http\http.ecf"/>
<library name="http_authorization" location="$ISE_LIBRARY\contrib\library\web\authentication\http_authorization\http_authorization.ecf" readonly="false"/>
<library name="json" location="$ISE_LIBRARY\contrib\library\text\parser\json\library\json.ecf"/>