mattyatea 33507e24ff Merge remote-tracking branch 'misskey-original/develop' into develop ... # Conflicts: # packages/backend/src/models/RepositoryModule.ts # packages/backend/src/models/_.ts # packages/backend/src/postgres.ts # packages/frontend/src/components/MkDrive.file.vue # packages/frontend/src/components/MkEmojiPicker.vue # packages/frontend/src/pages/admin/index.vue # packages/frontend/src/pages/user/home.vue # packages/frontend/src/router.ts # packages/frontend/src/ui/universal.vue		2024-01-11 21:46:28 +09:00
..
api	Merge remote-tracking branch 'misskey-original/develop' into develop	2024-01-11 21:46:28 +09:00
assets	なんかもうめっちゃ変えた	2022-09-18 03:27:08 +09:00
oauth	feat(backend/oauth): allow CORS for token endpoint (#12814)	2023-12-27 15:10:24 +09:00
web	Merge remote-tracking branch 'misskey-original/develop' into develop	2024-01-02 21:29:17 +09:00
ActivityPubServerService.ts	enhance: “つながりの公開範囲”がフォロー・フォロワー個別設定できるように (#12702)	2023-12-18 20:59:20 +09:00
FileServerService.ts	Merge remote-tracking branch 'misskey-original/develop' into develop	2024-01-02 21:29:17 +09:00
NodeinfoServerService.ts	fix(backend): enhance nodeinfo by export instance admin via nodeAdmins key (#12503)	2023-12-03 13:42:41 +09:00
ServerModule.ts	remove hybrid-all-timeline and update	2023-10-18 22:40:40 +09:00
ServerService.ts	feat(backend/oauth): allow CORS for token endpoint (#12814)	2023-12-27 15:10:24 +09:00
WellKnownServerService.ts	feat(backend/oauth): allow CORS for token endpoint (#12814)	2023-12-27 15:10:24 +09:00