Merge branch 'feature/nodeinfo_federation_info' into 'develop'
authorkaniini <nenolod@gmail.com>
Fri, 5 Oct 2018 20:41:16 +0000 (20:41 +0000)
committerkaniini <nenolod@gmail.com>
Fri, 5 Oct 2018 20:41:16 +0000 (20:41 +0000)
commitf7ba393bb94f29bb79bc34ff3c708f929f61cc57
tree8b3aa718fa449d9cc00e1c6923e8b32961768eb6
parent4f03bb22998b9713d84dc8e81a3d63bb60c5b648
parentf2efc8dcfbede6df655b3e85af6327802118c185
Merge branch 'feature/nodeinfo_federation_info' into 'develop'

Nodeinfo federation info

See merge request pleroma/pleroma!367