diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-03-20 11:33:52 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-03-20 11:33:52 -0400 |
| commit | f4ca441148699a186918f6eea70bc3d44a65e6dc (patch) | |
| tree | be041c9cbb29defbb22fadb1a11c1e28396eaf32 /view/ca/friend_complete_eml.tpl | |
| parent | 5642e9fa388bb84027a7b71a3baeef39c3aafcab (diff) | |
| parent | 9df797299320cea01c541bb4997e498f915f98fa (diff) | |
| download | volse-hubzilla-f4ca441148699a186918f6eea70bc3d44a65e6dc.tar.gz volse-hubzilla-f4ca441148699a186918f6eea70bc3d44a65e6dc.tar.bz2 volse-hubzilla-f4ca441148699a186918f6eea70bc3d44a65e6dc.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
bug #339 - lostpass sending to username, not email
* master:
Diffstat (limited to 'view/ca/friend_complete_eml.tpl')
0 files changed, 0 insertions, 0 deletions