1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00

Merge branch '3.1.x'

Conflicts:
	phpBB/styles/subsilver2/template/ucp_main_front.html
This commit is contained in:
Marc Alexander
2015-07-20 13:07:32 +02:00
2 changed files with 16 additions and 0 deletions

View File

@@ -1123,6 +1123,20 @@ ucp_agreement_terms_before
* Since: 3.1.0-b3
* Purpose: Add content before the terms of agreement text at user registration
ucp_main_front_user_activity_after
===
* Locations:
+ styles/prosilver/template/ucp_main_front.html
* Since: 3.1.6-RC1
* Purpose: Add content right after the user activity info viewing UCP front page
ucp_main_front_user_activity_before
===
* Locations:
+ styles/prosilver/template/ucp_main_front.html
* Since: 3.1.6-RC1
* Purpose: Add content right before the user activity info viewing UCP front page
ucp_pm_viewmessage_avatar_after
===
* Locations: