Merge branch '3.1.x'

This commit is contained in:
Marc Alexander 2015-08-08 22:40:40 +02:00
commit e41fcab3de
2 changed files with 8 additions and 0 deletions

View file

@ -343,6 +343,8 @@
<!-- EVENT acp_forums_rules_settings_append -->
</fieldset>
</div>
<!-- EVENT acp_forums_custom_settings -->
<fieldset class="submit-buttons">
<legend>{L_SUBMIT}</legend>

View file

@ -22,6 +22,12 @@ acp_email_options_after
* Since: 3.1.2-RC1
* Purpose: Add settings to mass email form
acp_forums_custom_settings
===
* Location: adm/style/acp_forums.html
* Since: 3.1.6-RC1
* Purpose: Add its own box (fieldset) for extension settings
acp_forums_main_settings_append
===
* Location: adm/style/acp_forums.html