1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-15 05:04:09 +02:00

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

Conflicts:
	phpBB/styles/prosilver/theme/tweaks.css
This commit is contained in:
Shibu Lijack
2012-04-10 21:46:14 +05:30
125 changed files with 3795 additions and 5220 deletions

View File

@@ -1,5 +1,6 @@
<!-- INCLUDE mcp_header.html -->
<div class="tabs-container">
<h2><a href="{U_VIEW_TOPIC}">{L_TOPIC}: {TOPIC_TITLE}</a></h2>
<script type="text/javascript">
@@ -34,6 +35,7 @@ onload_functions.push('subPanels()');
</li>
</ul>
</div>
</div>
<form id="mcp" method="post" action="{S_MCP_ACTION}">