Merge branch '3.2.x'

* 3.2.x:
  [ticket/14887] ACP profile step one lang specific event
This commit is contained in:
Tristan Darricau 2016-12-11 20:43:42 +01:00
commit d1959cb731
No known key found for this signature in database
GPG key ID: 817043C2E29DB881
2 changed files with 8 additions and 0 deletions

View file

@ -127,6 +127,7 @@
<!-- ENDIF --> <!-- ENDIF -->
</dl> </dl>
<!-- ENDIF --> <!-- ENDIF -->
<!-- EVENT acp_profile_step_one_lang_after -->
</fieldset> </fieldset>
<fieldset class="quick"> <fieldset class="quick">

View file

@ -381,6 +381,13 @@ acp_profile_contact_before
* Since: 3.1.6-RC1 * Since: 3.1.6-RC1
* Purpose: Add extra options to custom profile field configuration in the ACP * Purpose: Add extra options to custom profile field configuration in the ACP
acp_profile_step_one_lang_after
===
* Locations:
+ adm/style/acp_profile.html
* Since: 3.1.11-RC1
* Purpose: Add extra lang specific options to custom profile field step one configuration in the ACP
acp_prune_forums_append acp_prune_forums_append
=== ===
* Locations: * Locations: