Merge branch 'master' into merge_master_2

diff --cc server/src/api/mod.rs
Simple merge

diff --cc server/src/routes/mod.rs
Simple merge

diff --cc server/src/routes/nodeinfo.rs
Simple merge

diff --cc server/src/routes/webfinger.rs
Simple merge