Skip to content
GitLab
Explore
Sign in
Register
An Darna
pleroma-deploy
Repository
pleroma-deploy
lib
pleroma
web
nodeinfo
nodeinfo_controller.ex
Find file
Blame
History
Permalink
Merge branch 'develop' into 'feature/staff-discovery-api'
· 76c67a41
kaniini
authored
Sep 03, 2018
# Conflicts: # lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
76c67a41