merge
authorsadposter <hannah+pleroma@coffee-and-dreams.uk>
Sun, 27 Jun 2021 21:31:37 +0000 (22:31 +0100)
committersadposter <hannah+pleroma@coffee-and-dreams.uk>
Sun, 27 Jun 2021 21:31:37 +0000 (22:31 +0100)
commite56c319e8f4c121c5a3c014ac0b2e3567bfa636b
treecc412f09b5c00def9b0a585ad79d36a5402c9981
parent50a644a2215a144e54a9f9d2a5216bec4e717405
parentf9ae7e72e9d745a1174353814d0ae6774f36ba3f
merge
.gitignore
config/config.exs
lib/pleroma/web/nodeinfo/nodeinfo_controller.ex