From: kaniini <nenolod@gmail.com>
Date: Sun, 26 Aug 2018 21:35:12 +0000 (+0000)
Subject: Merge branch 'login-with-email' into 'develop'
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=c9e4c45e0e381eb0293588f65c49212e3573161a;p=akkoma

Merge branch 'login-with-email' into 'develop'

When logging in, try treating the login as an email

Closes #245

See merge request pleroma/pleroma!295
---

c9e4c45e0e381eb0293588f65c49212e3573161a