mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.1.x' into 3.2.x

Browse Source 
Conflicts:
	phpBB/styles/subsilver2/template/memberlist_email.html
This commit is contained in:
Marc Alexander
2016-08-03 22:21:25 +02:00
parent 55123bc94c 5330ea0f09
commit 6cc4d78ebf
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/styles/prosilver/template/memberlist_email.html
View File

@@ -1,5 +1,7 @@
<!-- INCLUDE overall_header.html -->
<!-- EVENT memberlist_email_before -->
<!-- IF S_CONTACT_ADMIN-->
<h2 class="titlespace">{L_CONTACT_ADMIN}</h2>
<!-- ELSEIF S_SEND_USER -->