Commit acc30b53 authored by Richard Mansfield's avatar Richard Mansfield
Browse files

Merge branch 'institutionaladmin' of...

Merge branch 'institutionaladmin' of git+ssh://git.catalyst.net.nz/var/git/mahara into institutionaladmin
parents 1359c815 42d50fbf
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
<FIELD NAME="registerallowed" TYPE="int" LENGTH="1" NOTNULL="true" DEFAULT="1"/> <FIELD NAME="registerallowed" TYPE="int" LENGTH="1" NOTNULL="true" DEFAULT="1"/>
<FIELD NAME="updateuserinfoonlogin" TYPE="int" LENGTH="1" NOTNULL="false" DEFAULT="0"/> <FIELD NAME="updateuserinfoonlogin" TYPE="int" LENGTH="1" NOTNULL="false" DEFAULT="0"/>
<FIELD NAME="theme" TYPE="char" LENGTH="255" NOTNULL="false"/> <FIELD NAME="theme" TYPE="char" LENGTH="255" NOTNULL="false"/>
<FIELD NAME="defaultmembershipperiod" TYPE="int" NOTNULL="true" DEFAULT="0"/> <FIELD NAME="defaultmembershipperiod" TYPE="int" NOTNULL="false" />
<FIELD NAME="maxuseraccounts" TYPE="int" NOTNULL="false" /> <FIELD NAME="maxuseraccounts" TYPE="int" NOTNULL="false" />
</FIELDS> </FIELDS>
<KEYS> <KEYS>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment