diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-03-03 13:39:56 -0500 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-03-03 13:39:56 -0500 |
| commit | da78d8594f79792f2c144cdb5b76b561ec03b278 (patch) | |
| tree | d2986a36db224e06754f43ad8c52c2518b65ccd5 /view/diaspora_vcard.tpl | |
| parent | 2b9ea33e8b2f774d7c4da5175e167470f1070282 (diff) | |
| parent | 1dfd5c4f85f2e0407f006ca962dc3dd62b092aba (diff) | |
| download | volse-hubzilla-da78d8594f79792f2c144cdb5b76b561ec03b278.tar.gz volse-hubzilla-da78d8594f79792f2c144cdb5b76b561ec03b278.tar.bz2 volse-hubzilla-da78d8594f79792f2c144cdb5b76b561ec03b278.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
fixed star/unstar
fixed admin fixed editor
* master:
Diffstat (limited to 'view/diaspora_vcard.tpl')
0 files changed, 0 insertions, 0 deletions