aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/docs/coding-guidelines.html
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2010-11-18 14:05:56 +0100
committerAndreas Fischer <bantu@phpbb.com>2010-11-18 14:05:56 +0100
commit635752fafc275c091cfc130e2f7b5e2ca5fe91d5 (patch)
treef7b33c10e2db306c0cab7cd05b73a00675f41b4e /phpBB/docs/coding-guidelines.html
parent2e51e68ca145940462155d5164bf91bb4264d488 (diff)
parentfbca4e9c7b2f723dde8e0034b7f5fedc9d0c8483 (diff)
downloadforums-635752fafc275c091cfc130e2f7b5e2ca5fe91d5.tar
forums-635752fafc275c091cfc130e2f7b5e2ca5fe91d5.tar.gz
forums-635752fafc275c091cfc130e2f7b5e2ca5fe91d5.tar.bz2
forums-635752fafc275c091cfc130e2f7b5e2ca5fe91d5.tar.xz
forums-635752fafc275c091cfc130e2f7b5e2ca5fe91d5.zip
Merge branch 'develop-olympus' into develop
* develop-olympus: [ticket/9899] Change recaptcha theme from default to 'clean' in the ACP. [ticket/9509] Fix a typo and wrong period placement [develop-olympus] Revert accidental revert of db update lang fix and version [develop-olympus] Remove accidentally added trailing newlines. [develop-olympus] Incrementing the version number to 3.0.9-dev.
Diffstat (limited to 'phpBB/docs/coding-guidelines.html')
-rw-r--r--phpBB/docs/coding-guidelines.html4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/docs/coding-guidelines.html b/phpBB/docs/coding-guidelines.html
index 004ed5b5f6..766242ab83 100644
--- a/phpBB/docs/coding-guidelines.html
+++ b/phpBB/docs/coding-guidelines.html
@@ -2444,9 +2444,9 @@ if (utf8_case_fold_nfc($string1) == utf8_case_fold_nfc($string2))
</li>
</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>