diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2010-07-08 20:10:17 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2010-07-08 20:10:17 +0200 |
| commit | a2918fd98e61db0e7e9885fb546abc024c84d0fc (patch) | |
| tree | 9fa6b52d6bb55ec5256c67e821550e111ee50dbe /phpBB/docs/coding-guidelines.html | |
| parent | 31b221ae913c49fa2e2a776bd9fd54659728fcd0 (diff) | |
| parent | 6da582e8be50fa7211706625402215f6f87ed48b (diff) | |
| download | forums-a2918fd98e61db0e7e9885fb546abc024c84d0fc.tar forums-a2918fd98e61db0e7e9885fb546abc024c84d0fc.tar.gz forums-a2918fd98e61db0e7e9885fb546abc024c84d0fc.tar.bz2 forums-a2918fd98e61db0e7e9885fb546abc024c84d0fc.tar.xz forums-a2918fd98e61db0e7e9885fb546abc024c84d0fc.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/9704] Fix minor typo in coding guidelines.
[ticket/9690] Add forthcoming Bing Bot to list of recognized bots
[ticket/9451] Add optional $can_upload parameter to avatar_process_user().
[ticket/9593] A readme file for unit tests and running unit tests.
[ticket/9570] Changed "system" to "guest" timezone in ACP, added explanation.
[ticket/9589] Added sample nginx configuration file for phpbb.
Diffstat (limited to 'phpBB/docs/coding-guidelines.html')
| -rw-r--r-- | phpBB/docs/coding-guidelines.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/docs/coding-guidelines.html b/phpBB/docs/coding-guidelines.html index f340b671cc..113910387c 100644 --- a/phpBB/docs/coding-guidelines.html +++ b/phpBB/docs/coding-guidelines.html @@ -297,7 +297,7 @@ PHPBB_QA (Set board to QA-Mode, which means the updater also c <div class="content"> - <p>Please note that these Guidelines applies to all php, html, javascript and css files.</p> + <p>Please note that these guidelines apply to all php, html, javascript and css files.</p> <a name="namingvars"></a><h3>2.i. Variable/Function/Class Naming</h3> |