Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
authorsadposter <hannah+pleroma@coffee-and-dreams.uk>
Sun, 29 Mar 2020 19:57:38 +0000 (20:57 +0100)
committersadposter <hannah+pleroma@coffee-and-dreams.uk>
Sun, 29 Mar 2020 19:57:38 +0000 (20:57 +0100)
commit931d663a3a9da845b9f789ed9c2b5e35140df22f
tree42405e0a45785e5243cb83ef7b65ceb48505bb9d
parent5f625c91361f68186a95354bbcff108435ce4d07
parente999c67cee65cfe07de6dc76ad18f213c0252bb3
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
config/config.exs
lib/pleroma/web/nodeinfo/nodeinfo_controller.ex