aboutsummaryrefslogtreecommitdiffstats
path: root/view/contacts-template.tpl
diff options
context:
space:
mode:
authorSimon L'nu <simon.lnu@gmail.com>2012-04-15 03:17:01 -0400
committerSimon L'nu <simon.lnu@gmail.com>2012-04-15 03:17:01 -0400
commitd90076b01a34ad8f8a04396bd90ae6c5f504a1b8 (patch)
treef7b6f7a086a96a096730b19ed520b93ca534427c /view/contacts-template.tpl
parent4572179a24d575df19b96427479dc11f7d137683 (diff)
downloadvolse-hubzilla-d90076b01a34ad8f8a04396bd90ae6c5f504a1b8.tar.gz
volse-hubzilla-d90076b01a34ad8f8a04396bd90ae6c5f504a1b8.tar.bz2
volse-hubzilla-d90076b01a34ad8f8a04396bd90ae6c5f504a1b8.zip
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: * master:
Diffstat (limited to 'view/contacts-template.tpl')
0 files changed, 0 insertions, 0 deletions