diff options
| author | Friendika <info@friendika.com> | 2011-03-17 14:44:06 -0700 |
|---|---|---|
| committer | Friendika <info@friendika.com> | 2011-03-17 14:44:06 -0700 |
| commit | 6b37e6d48d8d7a313d2eb88155752241c6c930d5 (patch) | |
| tree | 46af2ae9350d3f1d27fffbdac0aa5e753c206b93 /view/atom_mail.tpl | |
| parent | 90178f86cb02cc3b6d2b7e5d49222dfeec0e8921 (diff) | |
| parent | e94ae8d396b8583407b140faf211f4f92a503bc6 (diff) | |
| download | volse-hubzilla-6b37e6d48d8d7a313d2eb88155752241c6c930d5.tar.gz volse-hubzilla-6b37e6d48d8d7a313d2eb88155752241c6c930d5.tar.bz2 volse-hubzilla-6b37e6d48d8d7a313d2eb88155752241c6c930d5.zip | |
Merge branch 'master' of http://github.com/erikl/friendika into erikl-master
Conflicts:
view/sv/contact_edit.tpl
view/sv/strings.php
Diffstat (limited to 'view/atom_mail.tpl')
0 files changed, 0 insertions, 0 deletions