From: feld <feld@feld.me>
Date: Tue, 14 Jul 2020 16:48:26 +0000 (+0000)
Subject: Merge branch '1940-admin-token-oauthless-auth' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=2909dc873b1cf4b2fdfd310d2bb61104d31cea17;p=akkoma

Merge branch '1940-admin-token-oauthless-auth' into 'develop'

[#1940] Reinstated OAuth-less `admin_token` authentication

Closes #1940

See merge request pleroma/pleroma!2760
---

2909dc873b1cf4b2fdfd310d2bb61104d31cea17