diff options
| author | Friendika <info@friendika.com> | 2011-04-04 15:46:33 -0700 |
|---|---|---|
| committer | Friendika <info@friendika.com> | 2011-04-04 15:46:33 -0700 |
| commit | 1bba63fb607c2cb5fb2c002e63ad7128ecf8b1ea (patch) | |
| tree | 0c34fbaa00d6eab272e6bd48a596d146d708cef8 /view/netfriend.tpl | |
| parent | 91588934d2e07d06ac9353ac899bcb470cc293f0 (diff) | |
| parent | a0d2747d527221fc517e5d277035d6e5b07ebf93 (diff) | |
| download | volse-hubzilla-1bba63fb607c2cb5fb2c002e63ad7128ecf8b1ea.tar.gz volse-hubzilla-1bba63fb607c2cb5fb2c002e63ad7128ecf8b1ea.tar.bz2 volse-hubzilla-1bba63fb607c2cb5fb2c002e63ad7128ecf8b1ea.zip | |
Merge branch 'erikl-master'
Conflicts:
view/sv/settings.tpl
Diffstat (limited to 'view/netfriend.tpl')
0 files changed, 0 insertions, 0 deletions