akkoma/lib/pleroma/web/nodeinfo
kaniini 76c67a41c1 Merge branch 'develop' into 'feature/staff-discovery-api'
# Conflicts:
#   lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
2018-09-03 14:55:42 +00:00
..
nodeinfo.ex Format files 2018-05-02 21:43:12 +02:00
nodeinfo_controller.ex Merge branch 'develop' into 'feature/staff-discovery-api' 2018-09-03 14:55:42 +00:00