makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.1.x'

Browse source 
Conflicts:
	phpBB/styles/subsilver2/template/memberlist_im.html
This commit is contained in:
Marc Alexander 2015-12-23 13:32:44 +01:00
commit 6a4e296c43
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
phpBB/styles/prosilver/template/memberlist_im.html
View file

@ -9,6 +9,10 @@
<p>{L_SEND_IM_EXPLAIN}</p> <p>{L_SEND_IM_EXPLAIN}</p>
<!-- IF S_SENT_JABBER -->
<p>{L_IM_SENT_JABBER}</p>
<!-- ENDIF -->
<fieldset> <fieldset>
<dl class="fields2"> <dl class="fields2">
<dt><label>{L_IM_RECIPIENT}{L_COLON}</label></dt> <dt><label>{L_IM_RECIPIENT}{L_COLON}</label></dt>
@ -24,10 +28,6 @@
<dt>&nbsp;</dt> <dt>&nbsp;</dt>
<dd><input class="button1" name="submit" type="submit" value="{L_IM_SEND}" /></dd> <dd><input class="button1" name="submit" type="submit" value="{L_IM_SEND}" /></dd>
</dl> </dl>
<dl class="fields2">
<dt>&nbsp;</dt>
<dd>{L_IM_SENT_JABBER}</dd>
</dl>
<!-- ELSE IF S_NO_SEND_JABBER --> <!-- ELSE IF S_NO_SEND_JABBER -->
<dl class="fields2"> <dl class="fields2">
<dt>&nbsp;</dt> <dt>&nbsp;</dt>