Skip to content
Snippets Groups Projects
Commit 76c67a41 authored by kaniini's avatar kaniini
Browse files

Merge branch 'develop' into 'feature/staff-discovery-api'

# Conflicts:
#   lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
parents d3f6814f 1c9e539b
Branches feature/staff-discovery-api
No related tags found
No related merge requests found
Showing
with 484 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 to comment