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/blog/cms_blog_module-safe.ecf
This commit is contained in:
Jocelyn FIAT
2017-03-02 16:05:20 +01:00
parent 099dc968fd f5671bc190
commit 12e02bdfbf
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
modules/blog/cms_blog_module.ecf
View File

@@ -15,6 +15,7 @@
<library name="cms" location="..\..\cms.ecf" readonly="false"/>
<library name="cms_model" location="..\..\library\model\cms_model.ecf" readonly="false"/>
<library name="cms_node_module" location="..\..\modules\node\node.ecf" readonly="false"/>
<library name="cms_taxnomy_module" location="..\..\modules\taxonomy\taxonomy.ecf"/>
<library name="error" location="$ISE_LIBRARY\contrib\library\utility\general\error\error.ecf"/>
<library name="http" location="$ISE_LIBRARY\contrib\library\network\protocol\http\http.ecf"/>
<library name="json" location="$ISE_LIBRARY\contrib\library\text\parser\json\library\json.ecf" readonly="false"/>