diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-05-19 02:59:40 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-05-19 02:59:40 -0400 |
| commit | 2cee9ec5c830098b5c57ae0c3d2a3d4e6697bce2 (patch) | |
| tree | 5ab08718ea4230918eeaa17f0d69d07faed082ff /view/contacts-template.tpl | |
| parent | 83f0807e59b5be288374a825d1e4f75869d515de (diff) | |
| parent | 4133df62234cc3466f34b8a7d52147a1e422bbc0 (diff) | |
| download | volse-hubzilla-2cee9ec5c830098b5c57ae0c3d2a3d4e6697bce2.tar.gz volse-hubzilla-2cee9ec5c830098b5c57ae0c3d2a3d4e6697bce2.tar.bz2 volse-hubzilla-2cee9ec5c830098b5c57ae0c3d2a3d4e6697bce2.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
profile change activity link bug
* master:
Diffstat (limited to 'view/contacts-template.tpl')
0 files changed, 0 insertions, 0 deletions