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

parent 4e5f16cdf9 fd4fd5aa7b

commit 71382a6f85

297 changed files with 60420 additions and 4574 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1106

packages/frontend/src/components/MkPostForm.vue

View file

File diff suppressed because it is too large Load diff