aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/twitter_api/twitter_api.ex
diff options
context:
space:
mode:
authorlambda <pleromagit@rogerbraun.net>2018-06-14 07:13:05 +0000
committerlambda <pleromagit@rogerbraun.net>2018-06-14 07:13:05 +0000
commit280ac243aa8593cf5e16a96a0a887f5cbfce50d0 (patch)
tree03daf72d77688ffc6e4bc31704ab3d028264f16e /lib/pleroma/web/twitter_api/twitter_api.ex
parent408152e232f8a156f2db9d2cdb4eafc9afc0ae41 (diff)
parent544246656906714b895e077f940900fb0cd07068 (diff)
downloadpleroma-280ac243aa8593cf5e16a96a0a887f5cbfce50d0.tar.gz
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
Diffstat (limited to 'lib/pleroma/web/twitter_api/twitter_api.ex')
0 files changed, 0 insertions, 0 deletions