Merge branch 'bugfix/oauth-password-with-email' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Thu, 14 Jun 2018 07:13:05 +0000 (07:13 +0000)
committerlambda <pleromagit@rogerbraun.net>
Thu, 14 Jun 2018 07:13:05 +0000 (07:13 +0000)
oauth: fix password-based login when username is email address

Closes #199

See merge request pleroma/pleroma!220


Trivial merge