mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-25 17:41:25 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into ticket/10734

Browse Source 
Conflicts:
	phpBB/styles/prosilver/theme/tweaks.css
This commit is contained in:
Shibu Lijack
2012-04-10 21:46:14 +05:30
parent daee253403 41e03164c1
commit fd55c8664a
125 changed files with 3795 additions and 5220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/styles/prosilver/template/mcp_warn_front.html
View File

@@ -55,7 +55,7 @@
</tbody>
</table>
<!-- ELSE -->
<p><strong>{L_WARNINGS_ZERO_TOTAL}</strong></p>
<p><strong>{L_NO_WARNINGS}</strong></p>
<!-- ENDIF -->
</div>
@@ -88,7 +88,7 @@
</tbody>
</table>
<!-- ELSE -->
<p><strong>{L_WARNINGS_ZERO_TOTAL}</strong></p>
<p><strong>{L_NO_WARNINGS}</strong></p>
<!-- ENDIF -->
</div>