diff options
author | kaniini <nenolod@gmail.com> | 2018-08-26 21:35:12 +0000 |
---|---|---|
committer | kaniini <nenolod@gmail.com> | 2018-08-26 21:35:12 +0000 |
commit | c9e4c45e0e381eb0293588f65c49212e3573161a (patch) | |
tree | da227cefb31bcfab162e3dee33611ffcd9abc2d8 /lib/pleroma/web/common_api/common_api.ex | |
parent | 3448b434f54e8b4749524e3ccd876359a6501845 (diff) | |
parent | 540cce5d1075fc3033254e5d8bf7d138485ed7bb (diff) | |
download | pleroma-c9e4c45e0e381eb0293588f65c49212e3573161a.tar.gz |
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
Diffstat (limited to 'lib/pleroma/web/common_api/common_api.ex')
0 files changed, 0 insertions, 0 deletions