diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-12-23 13:32:44 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-12-23 13:32:44 +0100 |
| commit | 6a4e296c436aa52477e7ebacdebc152fc3bcb2b1 (patch) | |
| tree | 93544b6c77baddfd17d6668f0e72d215eeb725ca /phpBB/styles | |
| parent | e6887ec10afbb80edadb374bf41d498d91201803 (diff) | |
| parent | 84ed888cb9642918575008e91da9bef82f80ce69 (diff) | |
| download | forums-6a4e296c436aa52477e7ebacdebc152fc3bcb2b1.tar forums-6a4e296c436aa52477e7ebacdebc152fc3bcb2b1.tar.gz forums-6a4e296c436aa52477e7ebacdebc152fc3bcb2b1.tar.bz2 forums-6a4e296c436aa52477e7ebacdebc152fc3bcb2b1.tar.xz forums-6a4e296c436aa52477e7ebacdebc152fc3bcb2b1.zip | |
Merge branch '3.1.x'
Conflicts:
phpBB/styles/subsilver2/template/memberlist_im.html
Diffstat (limited to 'phpBB/styles')
| -rw-r--r-- | phpBB/styles/prosilver/template/memberlist_im.html | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/styles/prosilver/template/memberlist_im.html b/phpBB/styles/prosilver/template/memberlist_im.html index bc71aa0969..874607d913 100644 --- a/phpBB/styles/prosilver/template/memberlist_im.html +++ b/phpBB/styles/prosilver/template/memberlist_im.html @@ -9,6 +9,10 @@ <p>{L_SEND_IM_EXPLAIN}</p> + <!-- IF S_SENT_JABBER --> + <p>{L_IM_SENT_JABBER}</p> + <!-- ENDIF --> + <fieldset> <dl class="fields2"> <dt><label>{L_IM_RECIPIENT}{L_COLON}</label></dt> @@ -24,10 +28,6 @@ <dt> </dt> <dd><input class="button1" name="submit" type="submit" value="{L_IM_SEND}" /></dd> </dl> - <dl class="fields2"> - <dt> </dt> - <dd>{L_IM_SENT_JABBER}</dd> - </dl> <!-- ELSE IF S_NO_SEND_JABBER --> <dl class="fields2"> <dt> </dt> |