]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Tue, 20 Mar 2012 15:33:52 +0000 (11:33 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Tue, 20 Mar 2012 15:33:52 +0000 (11:33 -0400)
commitf4ca441148699a186918f6eea70bc3d44a65e6dc
treebe041c9cbb29defbb22fadb1a11c1e28396eaf32
parent5642e9fa388bb84027a7b71a3baeef39c3aafcab
parent9df797299320cea01c541bb4997e498f915f98fa
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  bug #339 - lostpass sending to username, not email

* master: