Mizah/mizzkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'mattyateaFork/develop' into develop

Browse source 
# Conflicts:
#	CHANGELOG.md
#	README.md
#	locales/index.d.ts
#	locales/ja-JP.yml
#	package.json
#	packages/backend/src/core/activitypub/models/ApNoteService.ts
#	packages/backend/src/server/api/endpoints/admin/avatar-decorations/list.ts
#	packages/backend/src/server/api/endpoints/get-avatar-decorations.ts
#	packages/backend/test/unit/entities/UserEntityService.ts
#	packages/frontend/src/components/MkFollowButton.vue
#	packages/frontend/src/components/MkTimeline.vue
#	packages/frontend/src/pages/about.vue
#	packages/frontend/src/pages/emoji-edit-dialog.vue
#	packages/frontend/src/ui/universal.vue
This commit is contained in:
mattyatea 2024-07-15 14:59:54 +09:00
commit 71382a6f85
297 changed files with 60420 additions and 4574 deletions
Download patch file Download diff file Expand all files Collapse all files

2
packages/misskey-js/src/autogen/types.ts
View file

@ -6351,6 +6351,7 @@ export type operations = {
updatedAt: string | null;
name: string;
description: string;
category: string;
url: string;
roleIdsThatCanBeUsedThisDecoration: string[];
})[];
@ -16368,6 +16369,7 @@ export type operations = {
name: string;
description: string;
url: string;
category: string;
roleIdsThatCanBeUsedThisDecoration: string[];
}[];
};