Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop (0d148bd2) · Commits · Dima Krasner / Sharkey · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

Sharkey
- Activity
- Members
- Labels
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

0d148bd2

Commit 0d148bd2 authored 2 years ago by tamaina

Downloads
- Plain Diff

Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop

parents ebedb81e 3a62625b

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.md 1 addition, 3 deletions

CHANGELOG.md
package.json 1 addition, 1 deletion

package.json
packages/backend/src/core/activitypub/ApRendererService.ts 1 addition, 1 deletion

packages/backend/src/core/activitypub/ApRendererService.ts
packages/backend/src/misc/nyaize.ts 2 additions, 2 deletions

packages/backend/src/misc/nyaize.ts
packages/frontend/package.json 1 addition, 0 deletions

packages/frontend/package.json
packages/frontend/src/components/MkMediaVideo.vue 17 additions, 12 deletions

packages/frontend/src/components/MkMediaVideo.vue
pnpm-lock.yaml 56 additions, 0 deletions

pnpm-lock.yaml

with 79 additions and 19 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment