Merge branch 'bugfix/oauth-password-with-email' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Thu, 14 Jun 2018 07:13:05 +0000 (07:13 +0000)
committerlambda <pleromagit@rogerbraun.net>
Thu, 14 Jun 2018 07:13:05 +0000 (07:13 +0000)
commit280ac243aa8593cf5e16a96a0a887f5cbfce50d0
tree03daf72d77688ffc6e4bc31704ab3d028264f16e
parent408152e232f8a156f2db9d2cdb4eafc9afc0ae41
parent544246656906714b895e077f940900fb0cd07068
Merge branch 'bugfix/oauth-password-with-email' into 'develop'

oauth: fix password-based login when username is email address

Closes #199

See merge request pleroma/pleroma!220