aboutsummaryrefslogtreecommitdiffstats
path: root/mod/hcard.php
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-07-31 15:45:13 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-07-31 15:45:13 -0700
commitc1a953f96043c63c47bff7f5294005aba077e571 (patch)
tree6d55f13bff3cb2a89ed8f55f0d2730cf3ff47f6c /mod/hcard.php
parent1d218784d180deb0946cb5dd4100ed0ebd489346 (diff)
parent5e985ef34f06964a7d8ac6ab20a8481c4b3ddca7 (diff)
downloadvolse-hubzilla-c1a953f96043c63c47bff7f5294005aba077e571.tar.gz
volse-hubzilla-c1a953f96043c63c47bff7f5294005aba077e571.tar.bz2
volse-hubzilla-c1a953f96043c63c47bff7f5294005aba077e571.zip
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts: util/messages.po
Diffstat (limited to 'mod/hcard.php')
0 files changed, 0 insertions, 0 deletions