Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

P

pleroma
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

19bd799b

Commit 19bd799b authored 6 years ago by lain

Downloads
- Plain Diff

Merge branch 'bugfix/as2-accept-json' into 'develop'

accept application/json mimetype for fetching AS2 objects

See merge request pleroma/pleroma!846

parents 45b06860 e95dbecf

No related branches found

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

lib/pleroma/web/ostatus/ostatus_controller.ex 5 additions, 2 deletions

lib/pleroma/web/ostatus/ostatus_controller.ex
lib/pleroma/web/router.ex 4 additions, 4 deletions

lib/pleroma/web/router.ex
test/web/activity_pub/activity_pub_controller_test.exs 69 additions, 2 deletions

test/web/activity_pub/activity_pub_controller_test.exs

with 78 additions and 8 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 sign in to comment