usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
misskey/packages/backend/src/server
History
mattyatea 2b52a215e5 Merge remote-tracking branch 'misskey-original/develop' into develop 
# Conflicts:
#	package.json
#	packages/backend/src/core/QueueService.ts
#	packages/frontend/src/components/global/MkPageHeader.vue
#	packages/frontend/src/pages/admin/index.vue
#	packages/frontend/src/pages/clicker.vue
#	packages/frontend/src/pages/my-lists/index.vue
#	packages/frontend/src/pages/notifications.vue
#	packages/frontend/src/pages/settings/emoji-picker.vue
#	packages/frontend/src/pages/settings/mute-block.vue
#	packages/frontend/src/pages/timeline.vue
#	packages/frontend/src/ui/universal.vue
#	pnpm-lock.yaml
 		2024-02-16 19:40:51 +09:00
..
api Merge remote-tracking branch 'misskey-original/develop' into develop 2024-02-16 19:40:51 +09:00
assets なんかもうめっちゃ変えた 2022-09-18 03:27:08 +09:00
oauth (re) update SPDX-FileCopyrightText 2024-02-13 15:59:27 +00:00
web Merge remote-tracking branch 'misskey-original/develop' into develop 2024-02-16 19:40:51 +09:00
ActivityPubServerService.ts (re) update SPDX-FileCopyrightText 2024-02-13 15:59:27 +00:00
FileServerService.ts Merge remote-tracking branch 'misskey-original/develop' into develop 2024-02-16 19:40:51 +09:00
NodeinfoServerService.ts (re) update SPDX-FileCopyrightText 2024-02-13 15:59:27 +00:00
ServerModule.ts (re) update SPDX-FileCopyrightText 2024-02-13 15:59:27 +00:00
ServerService.ts (re) update SPDX-FileCopyrightText 2024-02-13 15:59:27 +00:00
WellKnownServerService.ts (re) update SPDX-FileCopyrightText 2024-02-13 15:59:27 +00:00