diff options
author | Simon L'nu <simon.lnu@gmail.com> | 2012-04-09 19:20:51 -0400 |
---|---|---|
committer | Simon L'nu <simon.lnu@gmail.com> | 2012-04-09 19:20:51 -0400 |
commit | 16c48b220070edc84c4e27bb680498f31066f3ba (patch) | |
tree | 31876f26f919cb896021fd235ccde8bf6e2ca744 /view/notifications_comments_item.tpl | |
parent | f1db6907860efcd4f48380bb8c0f88272adb91a8 (diff) | |
parent | 0fd05171d00449d81d060c293dfa0fc7ce814515 (diff) | |
download | volse-hubzilla-16c48b220070edc84c4e27bb680498f31066f3ba.tar.gz volse-hubzilla-16c48b220070edc84c4e27bb680498f31066f3ba.tar.bz2 volse-hubzilla-16c48b220070edc84c4e27bb680498f31066f3ba.zip |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
bbcode toolbar attached to the comment text field minor css-fixes
diabook-themes: small icon fix
diabook-nav-icons with gradient
use local_user for tag completion if available. See bug #368
more sane defaults datetime_convert
fix empty string timezone
Some new German translations
send zrl after dfrn_request homecoming for manual entries
fix to wall_upload photos default permissions to use cid rather than uid.
fixed z-index of youtube-vids fixed bug to hide right_side
* master:
Diffstat (limited to 'view/notifications_comments_item.tpl')
0 files changed, 0 insertions, 0 deletions