Merge branch 'fix/nodeinfo-unavailable-when-not-federating' into 'develop'
authorkaniini <nenolod@gmail.com>
Sat, 25 May 2019 01:45:17 +0000 (01:45 +0000)
committerkaniini <nenolod@gmail.com>
Sat, 25 May 2019 01:45:17 +0000 (01:45 +0000)
commit9f44fa068648929aff639ecd5fd74e9c643803b5
treefea5de81cc4afecefbc06ff9438d9f950d39db83
parent625fec58ffb598be9a2afaf693c923ccf90a465d
parent9415932af5829f2aa19e362076e0653dd1ce9c5a
Merge branch 'fix/nodeinfo-unavailable-when-not-federating' into 'develop'

Keep nodeinfo available when not federating

Closes #923

See merge request pleroma/pleroma!1202