1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-22 00:21:02 +01: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
commit 60af11da9d
No known key found for this signature in database
GPG Key ID: 50E0D2423696F995
2 changed files with 9 additions and 2 deletions

View File

@ -2123,6 +2123,13 @@ ucp_profile_register_details_after
* Since: 3.1.4-RC1
* Purpose: Add options in profile page fieldset - after confirm password field.
ucp_register_buttons_before
===
* Locations:
+ styles/prosilver/template/ucp_register.html
* Since: 3.1.11-RC1
* Purpose: Add content before buttons in registration form.
ucp_register_credentials_before
===
* Locations:

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">