aboutsummaryrefslogtreecommitdiffstats
path: root/view/diaspora_retract.tpl
diff options
context:
space:
mode:
authorSimon L'nu <simon.lnu@gmail.com>2012-05-01 00:49:42 -0400
committerSimon L'nu <simon.lnu@gmail.com>2012-05-01 00:49:42 -0400
commit46558e98a8282f2a2e12f5dbcfdbd39f139be9bb (patch)
tree8553a554618de8ab99a92e2969f120dfffbb9fe8 /view/diaspora_retract.tpl
parent9b7dac6ce19e99ae9341329f422685626146fbdb (diff)
parent2c577ed90f1d6a459d7c4b84db3ffd1f5d052ff8 (diff)
downloadvolse-hubzilla-46558e98a8282f2a2e12f5dbcfdbd39f139be9bb.tar.gz
volse-hubzilla-46558e98a8282f2a2e12f5dbcfdbd39f139be9bb.tar.bz2
volse-hubzilla-46558e98a8282f2a2e12f5dbcfdbd39f139be9bb.zip
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: diabook-themes: add "community profiles"-box to right_column change api.php in function api_item_get_user to check if $usercache is NULL before checking an element in it make 'aaa joined group bbb' work from the initiating end, new privacy pref to control it also hidewall wasn't properly checked before sending 'xxx is friends with yyy' messages diabook-themes: add "last tweets"-box to right_aside, that searches for #friendica on twitter rev update start adding tooltips to tab menus fix join group notifications * master:
Diffstat (limited to 'view/diaspora_retract.tpl')
0 files changed, 0 insertions, 0 deletions