aboutsummaryrefslogtreecommitdiffstats
path: root/view/contacts-template.tpl
diff options
context:
space:
mode:
authorSimon L'nu <simon.lnu@gmail.com>2012-04-14 15:12:39 -0400
committerSimon L'nu <simon.lnu@gmail.com>2012-04-14 15:12:39 -0400
commit1dd22be4d2fe997d9bde552f8d8a25ba12c67e7e (patch)
tree32486e253628ab64fa466f34dfc0703d9ce8644c /view/contacts-template.tpl
parent16f729912a00cc92d0473f3d326080531a2fb393 (diff)
parent6591b292a1e22e3eaec41af0a61a6911e9847098 (diff)
downloadvolse-hubzilla-1dd22be4d2fe997d9bde552f8d8a25ba12c67e7e.tar.gz
volse-hubzilla-1dd22be4d2fe997d9bde552f8d8a25ba12c67e7e.tar.bz2
volse-hubzilla-1dd22be4d2fe997d9bde552f8d8a25ba12c67e7e.zip
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: bogus empty list element in dfrn_request page when emailnet not enabled zrl on random profile zrl hook bug #372 - category feeds pass zrl's to/through global directory * master:
Diffstat (limited to 'view/contacts-template.tpl')
0 files changed, 0 insertions, 0 deletions