Skip to content
Snippets Groups Projects
Commit b9385687 authored by Ivan Tashkinov's avatar Ivan Tashkinov
Browse files

[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into...

[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes

# Conflicts:
#	CHANGELOG.md
#	lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
#	lib/pleroma/web/router.ex
parent 06b3bb54
Branches missing-mastodon-follow-endpoint
No related tags found
No related merge requests found
Pipeline #18314 passed
Showing
with 186 additions and 249 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment