diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2016-12-30 10:21:17 +0100 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2016-12-30 10:21:17 +0100 |
| commit | 1f65f85b538ac45ce7520d31af875f088bf468b0 (patch) | |
| tree | f1372548798ed585f876efaf9eb70f9dccf22741 | |
| parent | 739081b0459fd0c52d5f4a3fd1348c1f5566bc95 (diff) | |
| parent | 4139e4f2b5889fc54bcc2b6451c925158633c632 (diff) | |
| download | forums-1f65f85b538ac45ce7520d31af875f088bf468b0.tar forums-1f65f85b538ac45ce7520d31af875f088bf468b0.tar.gz forums-1f65f85b538ac45ce7520d31af875f088bf468b0.tar.bz2 forums-1f65f85b538ac45ce7520d31af875f088bf468b0.tar.xz forums-1f65f85b538ac45ce7520d31af875f088bf468b0.zip | |
Merge branch '3.1.x' into 3.2.x
| -rw-r--r-- | phpBB/adm/style/acp_ext_details.html | 1 | ||||
| -rw-r--r-- | phpBB/docs/events.md | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/phpBB/adm/style/acp_ext_details.html b/phpBB/adm/style/acp_ext_details.html index 4c1feb59a9..d7839f7ec8 100644 --- a/phpBB/adm/style/acp_ext_details.html +++ b/phpBB/adm/style/acp_ext_details.html @@ -134,4 +134,5 @@ <!-- END meta_authors --> </fieldset> + <!-- EVENT acp_ext_details_end --> <!-- INCLUDE overall_footer.html --> diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index 59fc184136..ec3fba91ce 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -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 |