mattyatea
|
71382a6f85
|
Merge remote-tracking branch 'mattyateaFork/develop' into develop
# 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
|
2024-07-15 14:59:54 +09:00 |