Merge branch 'prep-release-3.0.8' into develop-olympus

* prep-release-3.0.8:
  [ticket/9899] Change recaptcha theme from default to 'clean' in the ACP.
  [ticket/9509] Fix a typo and wrong period placement
This commit is contained in:
Andreas Fischer 2010-11-18 14:04:57 +01:00
commit fbca4e9c7b
2 changed files with 4 additions and 3 deletions

View file

@ -4,7 +4,8 @@
<script type="text/javascript"> <script type="text/javascript">
// <![CDATA[ // <![CDATA[
var RecaptchaOptions = { var RecaptchaOptions = {
lang : '{LA_RECAPTCHA_LANG}' lang : '{LA_RECAPTCHA_LANG}',
theme : 'clean',
}; };
// ]]> // ]]>
</script> </script>

View file

@ -2349,9 +2349,9 @@ if (utf8_case_fold_nfc($string1) == utf8_case_fold_nfc($string2))
</li> </li>
</ul> </ul>
<a name="commitmessage"></a><h3>7.ii. Commit Messages and Reposiory Rules</h3> <a name="commitmessage"></a><h3>7.ii. Commit Messages and Repository Rules</h3>
<p>Information on repository rules, such as commit messages can be found at <a href="http://wiki.phpbb.com/display/DEV/Git" title="phpBB Git Information">http://wiki.phpbb.com/display/DEV/Git</a></p>. <p>Information on repository rules, such as commit messages can be found at <a href="http://wiki.phpbb.com/display/DEV/Git" title="phpBB Git Information">http://wiki.phpbb.com/display/DEV/Git</a>.</p>
</div> </div>