From: kaniini <nenolod@gmail.com>
Date: Tue, 6 Nov 2018 16:18:12 +0000 (+0000)
Subject: Merge branch 'unify-mastodon-oauth' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=a68c18f0ad6befe432e961bd348744b305492524;p=akkoma

Merge branch 'unify-mastodon-oauth' into 'develop'

Unify Mastodon Login with OAuth login.

See merge request pleroma/pleroma!429
---

a68c18f0ad6befe432e961bd348744b305492524