merge commit

This commit is contained in:
robvde 2014-07-20 11:25:47 +08:00
commit 3572cd642b
270 changed files with 7870 additions and 4468 deletions

View file

@ -5,7 +5,7 @@
<Page name="Login" roles="?" skin="Login.ascx" adminskin="Login.ascx" hidden="True">
<Content id="ContentPane">
<Module moduleDefinitionID="Login" title="SignIn" container="Login.ascx" icon="admin_48.png" />
<Module moduleDefinitionID="Login" title="SignIn" container="Login.ascx" />
</Content>
</Page>