Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
authorsadposter <hannah+pleroma@coffee-and-dreams.uk>
Mon, 6 Apr 2020 13:44:26 +0000 (14:44 +0100)
committersadposter <hannah+pleroma@coffee-and-dreams.uk>
Mon, 6 Apr 2020 13:44:26 +0000 (14:44 +0100)
1  2 
config/config.exs
lib/pleroma/web/nodeinfo/nodeinfo_controller.ex

Simple merge