Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

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

Snippets Groups Projects

1d4ab065

Commit 1d4ab065 authored 4 years ago by lain

Downloads
- Plain Diff

Merge branch 'featureflag/emoji_reactions' into 'develop'

Add emoji reactions to features in nodeinfo

See merge request pleroma/pleroma!2313

parents 96ee0aad 7af0959a

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.md 1 addition, 0 deletions

CHANGELOG.md
docs/API/pleroma_api.md 1 addition, 1 deletion

docs/API/pleroma_api.md
lib/pleroma/web/nodeinfo/nodeinfo_controller.ex 2 additions, 1 deletion

lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
test/web/node_info_test.exs 56 additions, 30 deletions

test/web/node_info_test.exs

with 60 additions and 32 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