Merge branch 'login-with-email' into 'develop'
authorkaniini <nenolod@gmail.com>
Sun, 26 Aug 2018 21:35:12 +0000 (21:35 +0000)
committerkaniini <nenolod@gmail.com>
Sun, 26 Aug 2018 21:35:12 +0000 (21:35 +0000)
commitc9e4c45e0e381eb0293588f65c49212e3573161a
treeda227cefb31bcfab162e3dee33611ffcd9abc2d8
parent3448b434f54e8b4749524e3ccd876359a6501845
parent540cce5d1075fc3033254e5d8bf7d138485ed7bb
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