1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-06 16:56:44 +02:00

Merge branch 'develop-ascraeus' into develop

Conflicts:
	phpBB/styles/subsilver2/template/memberlist_search.html
This commit is contained in:
Joas Schilling
2014-11-21 19:25:32 +01:00
2 changed files with 24 additions and 0 deletions

View File

@@ -392,6 +392,27 @@ memberlist_body_username_prepend
* Purpose: Add information before every username in the memberlist. Works in
all display modes (leader, group and normal memberlist).
memberlist_search_fields_after
===
* Locations:
+ styles/prosilver/template/memberlist_search.html
* Since: 3.1.2-RC1
* Purpose: Add information after the search fields column.
memberlist_search_fields_before
===
* Locations:
+ styles/prosilver/template/memberlist_search.html
* Since: 3.1.2-RC1
* Purpose: Add information before the search fields column.
memberlist_search_sorting_options_before
===
* Locations:
+ styles/prosilver/template/memberlist_search.html
* Since: 3.1.2-RC1
* Purpose: Add information before the search sorting options field.
memberlist_view_contact_after
===
* Locations: