usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
parent a488e58edb 3e958d5bd4
commit 193e0eede2
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "misskey", "name": "misskey",
"version": "2023.9.0-beta.2", "version": "mattyaski-2023.9.0-beta.2",
"codename": "nasubi", "codename": "nasubi",
"repository": { "repository": {
"type": "git", "type": "git",

2
packages/backend/src/server/WellKnownServerService.ts
View File

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

1
packages/frontend/src/pages/about-misskey.vue
View File

@ -285,6 +285,7 @@ const patrons = [
'越貝鯛丸', '越貝鯛丸',
'Nick / pprmint.', 'Nick / pprmint.',
'kino3277', 'kino3277',
'美少女JKぐーちゃん',
]; ];
let thereIsTreasure = $ref($i && !claimedAchievements.includes('foundTreasure')); let thereIsTreasure = $ref($i && !claimedAchievements.includes('foundTreasure'));