diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-04-21 04:34:56 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-04-21 04:34:56 -0400 |
| commit | 2d129e7455b6b083809a03df97f299db732d79f6 (patch) | |
| tree | 5c11d463eff15245458f5033d7d425671df8f1d0 /view/theme/diabook-aerith/profile_vcard.tpl | |
| parent | bdbe068b95e8c302179530dff7583997ff35f246 (diff) | |
| download | volse-hubzilla-2d129e7455b6b083809a03df97f299db732d79f6.tar.gz volse-hubzilla-2d129e7455b6b083809a03df97f299db732d79f6.tar.bz2 volse-hubzilla-2d129e7455b6b083809a03df97f299db732d79f6.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
rev update
* master:
Diffstat (limited to 'view/theme/diabook-aerith/profile_vcard.tpl')
0 files changed, 0 insertions, 0 deletions