[#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
Showing
- lib/pleroma/web/activity_pub/activity_pub_controller.ex 0 additions, 5 deletionslib/pleroma/web/activity_pub/activity_pub_controller.ex
- lib/pleroma/web/masto_fe_controller.ex 12 additions, 0 deletionslib/pleroma/web/masto_fe_controller.ex
- lib/pleroma/web/mastodon_api/controllers/account_controller.ex 9 additions, 1 deletion...leroma/web/mastodon_api/controllers/account_controller.ex
- lib/pleroma/web/mastodon_api/controllers/app_controller.ex 3 additions, 0 deletionslib/pleroma/web/mastodon_api/controllers/app_controller.ex
- lib/pleroma/web/mastodon_api/controllers/domain_block_controller.ex 2 additions, 0 deletions...a/web/mastodon_api/controllers/domain_block_controller.ex
- lib/pleroma/web/mastodon_api/controllers/follow_request_controller.ex 2 additions, 0 deletions...web/mastodon_api/controllers/follow_request_controller.ex
- lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex 0 additions, 63 deletions...a/web/mastodon_api/controllers/mastodon_api_controller.ex
- lib/pleroma/web/mastodon_api/controllers/media_controller.ex 5 additions, 0 deletionslib/pleroma/web/mastodon_api/controllers/media_controller.ex
- lib/pleroma/web/mastodon_api/controllers/notification_controller.ex 2 additions, 0 deletions...a/web/mastodon_api/controllers/notification_controller.ex
- lib/pleroma/web/mastodon_api/controllers/poll_controller.ex 10 additions, 0 deletionslib/pleroma/web/mastodon_api/controllers/poll_controller.ex
- lib/pleroma/web/mastodon_api/controllers/report_controller.ex 2 additions, 0 deletions...pleroma/web/mastodon_api/controllers/report_controller.ex
- lib/pleroma/web/mastodon_api/controllers/search_controller.ex 2 additions, 0 deletions...pleroma/web/mastodon_api/controllers/search_controller.ex
- lib/pleroma/web/mastodon_api/controllers/status_controller.ex 5 additions, 0 deletions...pleroma/web/mastodon_api/controllers/status_controller.ex
- lib/pleroma/web/mastodon_api/controllers/subscription_controller.ex 2 additions, 0 deletions...a/web/mastodon_api/controllers/subscription_controller.ex
- lib/pleroma/web/mastodon_api/controllers/suggestion_controller.ex 5 additions, 0 deletions...oma/web/mastodon_api/controllers/suggestion_controller.ex
- lib/pleroma/web/pleroma_api/controllers/emoji_api_controller.ex 18 additions, 0 deletions...eroma/web/pleroma_api/controllers/emoji_api_controller.ex
- lib/pleroma/web/router.ex 105 additions, 180 deletionslib/pleroma/web/router.ex
- lib/pleroma/web/twitter_api/controllers/util_controller.ex 2 additions, 0 deletionslib/pleroma/web/twitter_api/controllers/util_controller.ex
Loading
Please register or sign in to comment