From: lambda <pleromagit@rogerbraun.net>
Date: Thu, 14 Jun 2018 07:13:05 +0000 (+0000)
Subject: Merge branch 'bugfix/oauth-password-with-email' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=280ac243aa8593cf5e16a96a0a887f5cbfce50d0;p=akkoma

Merge branch 'bugfix/oauth-password-with-email' into 'develop'

oauth: fix password-based login when username is email address

Closes #199

See merge request pleroma/pleroma!220
---

280ac243aa8593cf5e16a96a0a887f5cbfce50d0