summaryrefslogtreecommitdiff
path: root/packages/backend/src/server/api/ApiServerService.ts
diff options
context:
space:
mode:
authorHazelnoot <acomputerdog@gmail.com>2025-03-30 01:58:43 -0400
committerHazelnoot <acomputerdog@gmail.com>2025-03-30 01:58:43 -0400
commitea2a3be70f87cc8b953c37ffe82633be3ad4978c (patch)
treed8255e09eaebbaf5080775114fa11da811f3bcb2 /packages/backend/src/server/api/ApiServerService.ts
parentMerge branch 'misskey-develop' into merge/2025-03-24 (diff)
parentmerge: More Mastodon API fixes (resolves #405, #471, and #984) (!954) (diff)
downloadsharkey-ea2a3be70f87cc8b953c37ffe82633be3ad4978c.tar.gz
sharkey-ea2a3be70f87cc8b953c37ffe82633be3ad4978c.tar.bz2
sharkey-ea2a3be70f87cc8b953c37ffe82633be3ad4978c.zip
Merge branch 'develop' into merge/2025-03-24
# Conflicts: # packages/backend/src/core/activitypub/models/ApPersonService.ts
Diffstat (limited to 'packages/backend/src/server/api/ApiServerService.ts')
0 files changed, 0 insertions, 0 deletions