Merge branch 'unify-mastodon-oauth' into 'develop'
authorkaniini <nenolod@gmail.com>
Tue, 6 Nov 2018 16:18:12 +0000 (16:18 +0000)
committerkaniini <nenolod@gmail.com>
Tue, 6 Nov 2018 16:18:12 +0000 (16:18 +0000)
commita68c18f0ad6befe432e961bd348744b305492524
tree4096642128f76339d86a4beee7a5b19609f05876
parent0f3e78addb4a88106120737f2eb603ec136d99f9
parent236fd28aca4191617cf059ff0a536f6b2fef5d64
Merge branch 'unify-mastodon-oauth' into 'develop'

Unify Mastodon Login with OAuth login.

See merge request pleroma/pleroma!429