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

Merge branch 'master' into es17.01

Browse Source 
# Conflicts:
#	examples/demo/demo.ecf
#	modules/admin/admin-safe.ecf
This commit is contained in:
Jocelyn Fiat
2017-03-30 12:03:41 +02:00
parent 5ca9a0cd85 3072b99151
commit c261554a39
27 changed files with 815 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
examples/demo/demo.ecf
View File

@@ -40,6 +40,7 @@
<library name="cms_sitemap_module" location="..\..\modules\sitemap\sitemap.ecf" readonly="false"/>
<library name="cms_session_auth_module" location="..\..\modules\session_auth\cms_session_auth.ecf" readonly="false"/>
<library name="cms_taxnomy_module" location="..\..\modules\taxonomy\taxonomy.ecf" readonly="false"/>
<library name="embedded_video_module" location="..\..\modules\embedded_video\embedded_video.ecf" readonly="false"/>
<library name="cms_wikitext_module" location="..\..\modules\wikitext\wikitext.ecf" readonly="false"/>
<library name="persistence_sqlite3" location="..\..\library\persistence\sqlite3\sqlite3.ecf" readonly="false"/>
<!--