diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-05-04 17:03:23 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-05-04 17:03:23 -0400 |
| commit | 5830c32dceb2429656ee4957690dd78c24641f02 (patch) | |
| tree | f71428787e701421068ce53e446bed47b7078fcf /view/theme/dispy/conversation.tpl | |
| parent | 00190b7faab2baf21523a7243268057142f6de88 (diff) | |
| parent | 37d4181fde392b5d31d77531255b345d9a0e718b (diff) | |
| download | volse-hubzilla-5830c32dceb2429656ee4957690dd78c24641f02.tar.gz volse-hubzilla-5830c32dceb2429656ee4957690dd78c24641f02.tar.bz2 volse-hubzilla-5830c32dceb2429656ee4957690dd78c24641f02.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
category removal
Esperanto 100%
"show more" friends in common
* master:
Diffstat (limited to 'view/theme/dispy/conversation.tpl')
0 files changed, 0 insertions, 0 deletions