1
0
mirror of https://github.com/e107inc/e107.git synced 2025-07-31 20:00:37 +02:00

Merge branch 'master' into lib

This commit is contained in:
lonalore
2017-01-26 09:46:00 +01:00
247 changed files with 7633 additions and 2239 deletions

View File

@@ -8,7 +8,7 @@
<core name="admincss">admin_dark.css</core>
<core name="adminlanguage"></core>
<core name="adminpwordchange">0</core>
<core name="adminstyle">infopanel</core>
<core name="adminstyle">flexpanel</core>
<core name="admintheme">bootstrap3</core>
<core name="allowCommentEdit">0</core>
<core name="allowEmailLogin">2</core>

View File

@@ -8,8 +8,7 @@
<write>253</write>
</item>
<item name="country">
<type>db field</type>
<values>user_extended_country,country_iso,country_name,country_name</values>
<type>country</type>
<include_text></include_text>
<applicable>253</applicable>
<read>253</read>