aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme/facepark
diff options
context:
space:
mode:
authorHauke Zuehl <hzuehl@phone-talk.de>2012-06-16 18:04:59 +0200
committerHauke Zuehl <hzuehl@phone-talk.de>2012-06-16 18:04:59 +0200
commitf9a40ccbdea69fc7ffcbdc87356d535c67371210 (patch)
tree18eca4019eb8e64badb7035ab782b729b706cd64 /view/theme/facepark
parent1231dd72f02fdec59b78ed9a6408887c2ae0b8d4 (diff)
parent4faf0e609fe03095069c7a4bcdfc3496e4a28627 (diff)
downloadvolse-hubzilla-f9a40ccbdea69fc7ffcbdc87356d535c67371210.tar.gz
volse-hubzilla-f9a40ccbdea69fc7ffcbdc87356d535c67371210.tar.bz2
volse-hubzilla-f9a40ccbdea69fc7ffcbdc87356d535c67371210.zip
Merge remote branch 'upstream/master'
Diffstat (limited to 'view/theme/facepark')
-rw-r--r--view/theme/facepark/conversation.tpl2
1 files changed, 2 insertions, 0 deletions
diff --git a/view/theme/facepark/conversation.tpl b/view/theme/facepark/conversation.tpl
index 43bb1dd47..fccd9a8bb 100644
--- a/view/theme/facepark/conversation.tpl
+++ b/view/theme/facepark/conversation.tpl
@@ -16,6 +16,8 @@
</div>
{{ endfor }}
+<div id="conversation-end"></div>
+
{{ if $dropping }}
<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();">
<div id="item-delete-selected-icon" class="icon drophide" title="$dropping" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>