Merge branch '3.1'

This commit is contained in:
Andrew Short 2013-07-10 20:07:33 +10:00
commit 27de4367b8

View File

@ -13,7 +13,7 @@
<%t ContentController.InstallFilesDeleted "Installation files have been successfully deleted." %>
</p>
<p style="margin: 1em 0">
<%t ContentController.StartEditing 'You can start editing your site\'s content by opening <a href="{link}">the CMS</a>.' link="admin/" %>.
<%t ContentController.StartEditing 'You can start editing your content by opening <a href="{link}">the CMS</a>.' link="admin/" %>
<br />
&nbsp; &nbsp; <%t ContentController.Email "Email" %>: $Username<br />
&nbsp; &nbsp; <%t ContentController.Password "Password" %>: $Password<br />