Curse

mirror of https://github.com/misskey-dev/misskey.git synced 2026-03-22 03:53:35 +00:00

Files

mattyatea 04fae906c9 Merge remote-tracking branch 'misskey-original/develop' into develop

# Conflicts:
#	packages/backend/src/models/Meta.ts
#	packages/backend/src/server/api/endpoints/admin/meta.ts
#	packages/backend/src/server/api/endpoints/admin/update-meta.ts
#	packages/frontend/src/components/MkButton.vue
#	packages/frontend/src/components/MkMenu.vue
#	packages/frontend/src/components/MkNote.vue
#	packages/frontend/src/components/MkNoteDetailed.vue
#	packages/frontend/src/components/MkSwitch.button.vue
#	packages/frontend/src/pages/settings/general.vue

2024-04-01 15:32:52 +09:00

backend

Merge remote-tracking branch 'misskey-original/develop' into develop

2024-04-01 15:32:52 +09:00

cherrypick-js/src

fix

2024-02-13 13:29:10 +09:00

frontend

Merge remote-tracking branch 'misskey-original/develop' into develop

2024-04-01 15:32:52 +09:00

misskey-bubble-game

Merge remote-tracking branch 'misskey-original/develop' into develop