Skip to content
Snippets Groups Projects
Commit 2909dc87 authored by feld's avatar feld
Browse files

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

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

Closes #1940

See merge request pleroma/pleroma!2760
parents 246f49d6 124b4709
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 233 additions and 253 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment