diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-03-29 00:04:00 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-03-29 00:04:00 -0400 |
| commit | f2e2632810ad3ac465edcf4cf80e1dc89e995c82 (patch) | |
| tree | ebb3bc0f22f55ea2bcea023b32d0e57200c9293a /view/mail_conv.tpl | |
| parent | 4e4f7ac79fe5f75ee5595c3a6eb7d3e445c8c6e2 (diff) | |
| download | volse-hubzilla-f2e2632810ad3ac465edcf4cf80e1dc89e995c82.tar.gz volse-hubzilla-f2e2632810ad3ac465edcf4cf80e1dc89e995c82.tar.bz2 volse-hubzilla-f2e2632810ad3ac465edcf4cf80e1dc89e995c82.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
some reported warnings cleaned up
network permission ids
wrong var for notify total
fix notification total
improved rw notifications
bug #349 - email notls setting
add a searchbox to "find friends" for global search
bugfix in diabook
title not updated when editing post
New parameter in html2plain for plain text exports. More compatibility in API
API: added max_id
API: Now threading seems to work
API: Seesmic is now working. Optimizing text export.
Quotes with author are now having an "open/close" link
New bbcode element: "spoiler". Mail: Top post quotes are now embraced in "spoiler" elements
* master:
Diffstat (limited to 'view/mail_conv.tpl')
0 files changed, 0 insertions, 0 deletions