Hazelnoot 7132696285 Merge tag '2025.4.0' into merge/2025-03-24 ... # Conflicts: # .github/workflows/storybook.yml # locales/index.d.ts # package.json # packages/backend/src/models/json-schema/role.ts # packages/frontend/src/components/MkPageWindow.vue # packages/frontend/src/pages/admin/roles.editor.vue # packages/frontend/src/pages/admin/roles.vue # packages/frontend/src/pages/settings/preferences.vue # packages/frontend/src/pages/settings/privacy.vue # packages/frontend/src/pages/timeline.vue # packages/frontend/src/pref-migrate.ts # packages/frontend/src/ui/_common_/common.vue # packages/frontend/src/ui/deck.vue # packages/frontend/src/ui/universal.vue # packages/misskey-js/src/autogen/types.ts		2025-04-13 13:07:09 -04:00
..
@types	Add _RUFFLE_VERSION_ global Vite define	2024-12-08 19:16:36 +01:00
js	Merge tag '2025.4.0' into merge/2025-03-24	2025-04-13 13:07:09 -04:00
themes	Merge branch 'misskey-develop' into merge/2025-03-24	2025-04-05 12:24:00 -04:00
.gitignore	feat(frontend): ノート・ユーザータイムライン埋め込み (#13929)	2024-09-09 20:57:36 +09:00
build.js	wip (#15348)	2025-01-28 01:45:13 +00:00
eslint.config.js	merge upstream	2025-03-25 16:14:53 -04:00
package.json	merge upstream	2025-03-25 16:14:53 -04:00
tsconfig.json	merge upstream	2025-03-25 16:14:53 -04:00