projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e153b36 947431e)
Merge branch 'fix/login-with-username-or-email' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Wed, 18 Apr 2018 11:26:38 +0000 (11:26 +0000)
committerlambda <pleromagit@rogerbraun.net>
Wed, 18 Apr 2018 11:26:38 +0000 (11:26 +0000)
MastoAPI and OAuth: allow login with either email or username.

See merge request pleroma/pleroma!118


Trivial merge
Fork of https://akkoma.dev/AkkomaGang/akkoma.git