1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00

Merge branch '3.1.x' into 3.2.x

This commit is contained in:
Marc Alexander
2016-12-18 20:50:38 +01:00
2 changed files with 9 additions and 2 deletions

View File

@@ -79,8 +79,6 @@
<!-- ENDIF -->
<!-- IF S_COPPA -->
<div class="panel">
<div class="inner">
@@ -91,6 +89,8 @@
</div>
<!-- ENDIF -->
<!-- EVENT ucp_register_buttons_before -->
<div class="panel">
<div class="inner">