diff options
| author | Thomas Willingham <founder@kakste.com> | 2012-12-18 16:59:08 +0000 |
|---|---|---|
| committer | Thomas Willingham <founder@kakste.com> | 2012-12-18 16:59:08 +0000 |
| commit | d9194fdb5a6709eba8f47795dd5367d79ad0e367 (patch) | |
| tree | 86a91ec7a556310400c2eb26d45bbeb108486b36 /include/conversation.php | |
| parent | 2cb2896916ce98f16b891634fddcbd403c55d95f (diff) | |
| parent | e9b5b0f0b424930b87708080c4e6ce671016177b (diff) | |
| download | volse-hubzilla-d9194fdb5a6709eba8f47795dd5367d79ad0e367.tar.gz volse-hubzilla-d9194fdb5a6709eba8f47795dd5367d79ad0e367.tar.bz2 volse-hubzilla-d9194fdb5a6709eba8f47795dd5367d79ad0e367.zip | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
view/theme/redbasic/css/style.css
Diffstat (limited to 'include/conversation.php')
| -rw-r--r-- | include/conversation.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/conversation.php b/include/conversation.php index f910801ba..ea2f84cbf 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -703,6 +703,7 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional') { '$mode' => $mode, '$user' => $a->user, '$threads' => $threads, + '$wait' => t('Loading...'), '$dropping' => ($page_dropping?t('Delete Selected Items'):False), )); |