Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	packages/backend/src/server/api/endpoints/notes/hybrid-all-timeline.ts
This commit is contained in:
mattyatea 2023-09-03 20:51:12 +09:00
commit 193e0eede2
3 changed files with 3 additions and 2 deletions

View file

@ -73,7 +73,7 @@ export class WellKnownServerService {
});
fastify.get('/.well-known/host-meta.json', async (request, reply) => {
reply.header('Content-Type', jrd);
reply.header('Content-Type', 'application/json');
return {
links: [{
rel: 'lrdd',