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)
Unify Mastodon Login with OAuth login.

See merge request pleroma/pleroma!429


Trivial merge