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

ff3b09f6

Commit ff3b09f6 authored 6 years ago by lain

Downloads
- Plain Diff

Merge branch 'fix/ap-icon' into 'develop'

Do not federate instance avatar

Closes #759

See merge request pleroma/pleroma!977

parents c6ab5ebe 10a7a4a8

Branches

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

lib/pleroma/user.ex 4 additions, 4 deletions

lib/pleroma/user.ex
lib/pleroma/web/activity_pub/views/user_view.ex 15 additions, 8 deletions

lib/pleroma/web/activity_pub/views/user_view.ex
test/web/activity_pub/views/user_view_test.exs 23 additions, 0 deletions

test/web/activity_pub/views/user_view_test.exs

with 42 additions and 12 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