aboutsummaryrefslogtreecommitdiffstats
path: root/view/netfriend.tpl
diff options
context:
space:
mode:
authorSimon L'nu <simon.lnu@gmail.com>2012-05-23 05:03:05 -0400
committerSimon L'nu <simon.lnu@gmail.com>2012-05-23 05:03:05 -0400
commitbd12902d7b384c4ba38ae40c4fa1f34f7e5393b4 (patch)
tree93cd7fe6c2b9b0cc5851cb8324b5f6591d990f7f /view/netfriend.tpl
parente56af0e09e0852c7215546d6f9db32ce5cc21b39 (diff)
parent61dba985c14ebcfd20d18b579aee9b781f98bc23 (diff)
downloadvolse-hubzilla-bd12902d7b384c4ba38ae40c4fa1f34f7e5393b4.tar.gz
volse-hubzilla-bd12902d7b384c4ba38ae40c4fa1f34f7e5393b4.tar.bz2
volse-hubzilla-bd12902d7b384c4ba38ae40c4fa1f34f7e5393b4.zip
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: photo rotation event calendar theming import quattro event reminder mark bubbles unsupported keep FB out of private notes clear submanage, etc from session on logout if identity (uid) changes - reload any other open browser windows on next ping. * master:
Diffstat (limited to 'view/netfriend.tpl')
0 files changed, 0 insertions, 0 deletions