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)
commit8cec5796aee7f4f5c963955727d80751a1491ee6
tree8e9f8d52ce72c9209288aa56e5e503699fa60cd7
parent931d663a3a9da845b9f789ed9c2b5e35140df22f
parent1d4ab06505ec5143dbb1d78d718fa9efd1497751
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
config/config.exs
lib/pleroma/web/nodeinfo/nodeinfo_controller.ex