Merge branch '1940-admin-token-oauthless-auth' into 'develop'
authorfeld <feld@feld.me>
Tue, 14 Jul 2020 16:48:26 +0000 (16:48 +0000)
committerfeld <feld@feld.me>
Tue, 14 Jul 2020 16:48:26 +0000 (16:48 +0000)
commit2909dc873b1cf4b2fdfd310d2bb61104d31cea17
treedf0f854766448cb0e286a2024f9a8ea90f33f7c3
parent246f49d6858973fbb8fd4d4d9c2e5be7f9ccb283
parent124b4709dcf12a417f5164e53ef3ba67e538d4c7
Merge branch '1940-admin-token-oauthless-auth' into 'develop'

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

Closes #1940

See merge request pleroma/pleroma!2760
docs/configuration/cheatsheet.md