Merge branch 'fix-chats' into 'develop'
authorlain <lain@soykaf.club>
Fri, 26 Jun 2020 11:09:37 +0000 (11:09 +0000)
committerlain <lain@soykaf.club>
Fri, 26 Jun 2020 11:09:37 +0000 (11:09 +0000)
commit6db9f7cdb3adeda547b6e3e9ca887b685344351a
tree82b9e89deb8e2f40729b12bcf163613c23d0f27a
parent7c7a6509b92e335c42c36f6b4b414305e0c09f4b
parent7ed229641667f52dd82eb7c388ea28e79e09e507
Merge branch 'fix-chats' into 'develop'

Nodeinfo: Add chat information back in.

See merge request pleroma/pleroma!2691