1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 14:00:31 +02:00

Merge branch '3.1.x'

Conflicts:
	phpBB/includes/acp/acp_captcha.php
This commit is contained in:
Oliver Schramm
2015-11-06 13:28:24 +01:00
2 changed files with 60 additions and 12 deletions

View File

@@ -8,6 +8,13 @@
<p>{L_ACP_VC_EXT_GET_MORE}</p>
<!-- IF ERROR_MSG -->
<div class="errorbox">
<h3>{L_WARNING}</h3>
<p>{ERROR_MSG}</p>
</div>
<!-- ENDIF -->
<form id="acp_captcha" method="post" action="{U_ACTION}">
<fieldset>