projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 246f49d 124b470)
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)
[#1940] Reinstated OAuth-less `admin_token` authentication

Closes #1940

See merge request pleroma/pleroma!2760

1  2 
docs/configuration/cheatsheet.md patch | diff1 | diff2 | blob | history

diff --cc docs/configuration/cheatsheet.md
Simple merge
Fork of https://akkoma.dev/AkkomaGang/akkoma.git