diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-05-21 06:50:00 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-05-21 06:50:00 -0400 |
| commit | f570965ebe65fe7d549cafea5f5d8c04da3d986f (patch) | |
| tree | 4c5bbbd85a499bc3a9b4ec438200c3fa16e7ae53 /view/diaspora_vcard.tpl | |
| parent | 997d88b4496a0358fb82dcf5b2590389128f7255 (diff) | |
| download | volse-hubzilla-f570965ebe65fe7d549cafea5f5d8c04da3d986f.tar.gz volse-hubzilla-f570965ebe65fe7d549cafea5f5d8c04da3d986f.tar.bz2 volse-hubzilla-f570965ebe65fe7d549cafea5f5d8c04da3d986f.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
* master:
Diffstat (limited to 'view/diaspora_vcard.tpl')
0 files changed, 0 insertions, 0 deletions