1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-21 18:44:37 +02:00

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.
This commit is contained in:
Andreas Fischer
2010-07-08 20:10:17 +02:00
10 changed files with 167 additions and 7 deletions

View File

@ -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>