1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-12 09:22:01 +02:00

Merge branch '3.3.x'

This commit is contained in:
Marc Alexander
2020-01-06 12:01:26 +01:00
13 changed files with 119 additions and 31 deletions

View File

@ -4,7 +4,7 @@
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="keywords" content="" />
<meta name="description" content="Rhea coding guidelines document" />
<meta name="description" content="Proteus coding guidelines document" />
<title>phpBB3 &bull; Coding Guidelines</title>
<link href="assets/css/stylesheet.css" rel="stylesheet" type="text/css" media="screen" />
@ -20,9 +20,9 @@
<div class="inner">
<div id="doc-description">
<a href="../index.php" id="logo"><img src="assets/images/site_logo.gif" alt="" /></a>
<a href="../index.php" id="logo"><span class="site_logo"></span></a>
<h1>Coding Guidelines</h1>
<p>Rhea coding guidelines document</p>
<p>Proteus coding guidelines document</p>
<p style="display: none;"><a href="#start_here">Skip</a></p>
</div>
@ -37,7 +37,7 @@
<!-- BEGIN DOCUMENT -->
<p class="paragraph main-description">
These are the phpBB Coding Guidelines for Rhea, all attempts should be made to follow them as closely as possible.
These are the phpBB Coding Guidelines for Proteus, all attempts should be made to follow them as closely as possible.
</p>
<h1>Coding Guidelines</h1>