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)
commita80cdd590648d4eb812503fbf995598e6b4a95cb
tree24a65608c90e7962a4b15d1676a0895301d6404f
parente153b364a71de431787db236c57114f229162ddf
parent947431e9aa1d4dbf85f9ccc270f1989737744ed4
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