mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-07 01:06:48 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.1.x'

Browse Source 
Conflicts:
	tests/template/template_includecss_test.php
This commit is contained in:
Marc Alexander
2015-07-08 22:54:26 +02:00
parent 2fbfb0e004 f576f42b4d
commit 01097a24b5
9 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/docs/README.html
View File

@@ -6,7 +6,7 @@
<meta name="description" content="phpBB 3.1.x Readme" />
<title>phpBB &bull; Readme</title>
<link href="assets/css/stylesheet.css" rel="stylesheet" type="text/css" media="screen, projection" />
<link href="assets/css/stylesheet.css" rel="stylesheet" type="text/css" media="screen" />
</head>
@@ -366,7 +366,7 @@
</div></div>
<div>
<a id="bottom" name="bottom" accesskey="z"></a>
<a id="bottom" accesskey="z"></a>
</div>
</body>