Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop (c9e8399e) · 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

c9e8399e

Commit c9e8399e authored 2 years ago by tamaina

Downloads
- Plain Diff

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

parents 4c8b5abf decde50c

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

.github/misskey/test.yml 2 additions, 2 deletions

.github/misskey/test.yml
packages/client/src/components/MkReactionsViewer.details.vue 10 additions, 1 deletion

packages/client/src/components/MkReactionsViewer.details.vue
packages/client/src/components/global/MkEmoji.vue 16 additions, 7 deletions

packages/client/src/components/global/MkEmoji.vue
packages/client/src/components/global/MkPageHeader.vue 20 additions, 17 deletions

packages/client/src/components/global/MkPageHeader.vue
packages/client/src/pages/admin/overview.federation.vue 7 additions, 7 deletions

packages/client/src/pages/admin/overview.federation.vue
packages/client/src/pages/admin/overview.queue.vue 1 addition, 1 deletion

packages/client/src/pages/admin/overview.queue.vue
packages/client/src/pages/admin/overview.stats.vue 4 additions, 4 deletions

packages/client/src/pages/admin/overview.stats.vue
packages/client/src/scripts/emojilist.ts 4 additions, 0 deletions

packages/client/src/scripts/emojilist.ts

with 64 additions and 39 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