aboutsummaryrefslogtreecommitdiffstats
path: root/mod/hcard.php
diff options
context:
space:
mode:
authorHaakon Meland Eriksen <haakon.eriksen@far.no>2015-11-29 11:55:39 +0100
committerHaakon Meland Eriksen <haakon.eriksen@far.no>2015-11-29 11:55:39 +0100
commit4d97ea106cf45f9dd191358dc6bde3a7fab438c1 (patch)
tree29b9954ebd4fe6beb0261fc65b57838cc07b7b66 /mod/hcard.php
parent8cf6b4064fbea605eb01e02a8b0d9db8f1205946 (diff)
downloadvolse-hubzilla-4d97ea106cf45f9dd191358dc6bde3a7fab438c1.tar.gz
volse-hubzilla-4d97ea106cf45f9dd191358dc6bde3a7fab438c1.tar.bz2
volse-hubzilla-4d97ea106cf45f9dd191358dc6bde3a7fab438c1.zip
Resolving merge conflict
Diffstat (limited to 'mod/hcard.php')
0 files changed, 0 insertions, 0 deletions