From: lambda Date: Wed, 18 Apr 2018 11:26:38 +0000 (+0000) Subject: Merge branch 'fix/login-with-username-or-email' into 'develop' X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=a80cdd590648d4eb812503fbf995598e6b4a95cb;p=akkoma Merge branch 'fix/login-with-username-or-email' into 'develop' MastoAPI and OAuth: allow login with either email or username. See merge request pleroma/pleroma!118 --- a80cdd590648d4eb812503fbf995598e6b4a95cb