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:
commit
193e0eede2
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "misskey",
|
||||
"version": "2023.9.0-beta.2",
|
||||
"version": "mattyaski-2023.9.0-beta.2",
|
||||
"codename": "nasubi",
|
||||
"repository": {
|
||||
"type": "git",
|
||||
|
|
|
@ -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',
|
||||
|
|
|
@ -285,6 +285,7 @@ const patrons = [
|
|||
'越貝鯛丸',
|
||||
'Nick / pprmint.',
|
||||
'kino3277',
|
||||
'美少女JKぐーちゃん',
|
||||
];
|
||||
|
||||
let thereIsTreasure = $ref($i && !claimedAchievements.includes('foundTreasure'));
|
||||
|
|
Loading…
Reference in a new issue