1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-21 16:10:38 +01:00

Merge branch '3.1.x' into 3.2.x

This commit is contained in:
Tristan Darricau 2016-12-30 10:21:17 +01:00
commit 1f65f85b53
2 changed files with 7 additions and 0 deletions

View File

@ -134,4 +134,5 @@
<!-- END meta_authors -->
</fieldset>
<!-- EVENT acp_ext_details_end -->
<!-- INCLUDE overall_footer.html -->

View File

@ -58,6 +58,12 @@ acp_email_options_after
* Since: 3.1.2-RC1
* Purpose: Add settings to mass email form
acp_ext_details_end
===
* Location: adm/style/acp_ext_details.html
* Since: 3.1.11-RC1
* Purpose: Add more detailed information on extension after the available information.
acp_ext_list_disabled_title_after
===
* Location: adm/style/acp_ext_list.html